New upstream version 0.25.3upstream/0.25.3

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-01-21 19:17:10 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-01-21 19:17:10 +0100
commit: a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch)
tree: d9f86def771c7845f241ec81219b243c70523c60
parent: 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
356 files changed, 46152 insertions, 43853 deletions
diff --git a/ChangeLog b/ChangeLog
index 8349525..a3fd0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,602 @@
+commit e5a192163148d01708684bc38c4442824fda8178
+Author: Jens Georg <mail@jensge.org>
+Date:   Mon Jan 16 20:36:27 2017 +0100
+
+    Prepare 0.25.3
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	configure.ac
+
+commit dfe59ea0fa04633d233be973e8578af037ea822a
+Author: Alan Mortensen <alanmortensen.am@gmail.com>
+Date:	Sun Jan 15 02:01:13 2017 +0100
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit a246cf45e80204bf05419cb0a76d9a145940373a
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Jan 12 13:45:29 2017 +0100
+
+    Fix Icon filename in Serbian and Korean translations
+
+M	po/ko.po
+M	po/sr.po
+M	po/sr@latin.po
+
+commit 14b44bdee2cfff20018dc66053dd6defb7cb03f0
+Author: Andreas Brauchli <andreas.brauchli@sensirion.com>
+Date:	Thu Dec 8 16:09:32 2016 +0100
+
+    More reliable duplicate detection
+
+    Never compare thumbnail_md5 when the full md5 can be used to avoid
+    false
+    positive. Otherwise fall back to comparing thubnail_md5 where false
+    positives are possible.
+
+M	src/db/PhotoTable.vala
+
+commit 59da83435bfe4f14a716312f5cc871f9c04d6774
+Author: Amos Brocco <amos.brocco@gmail.com>
+Date:	Sun Nov 27 22:17:00 2016 +0000
+
+    Improved Raw duplicate detection
+
+    Use exposure timestamp comparison as well as file name to distinguish
+    between
+    different files with the same name
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=775196
+
+M	src/camera/ImportPage.vala
+
+commit 33b101fa36c685d24179a2f25aec91d0ae5102f6
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jan 4 12:45:42 2017 +0100
+
+    piwigo: Fix title and coments on uploaded files
+
+    Boolean is hard, part II.
+
+    Regression introduced by 9d2b698023366e95baddbb677118a50e27bd6e8e
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776664
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit 809b4cdd20ec6ec795c51ec046999f6f5106c07a
+Author: Richard B. Kreckel <kreckel@ginac.de>
+Date:	Tue Jan 3 23:00:00 2017 +0000
+
+    Fix various typos in comments and code
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776839
+
+M	src/Application.vala
+M	src/BatchImport.vala
+M	src/CheckerboardLayout.vala
+M	src/CollectionPage.vala
+M	src/Commands.vala
+M	src/Dialogs.vala
+M	src/Dimensions.vala
+M	src/Photo.vala
+M	src/PhotoPage.vala
+M	src/Printing.vala
+M	src/Tombstone.vala
+M	src/Upgrades.vala
+M	src/camera/GPhoto.vala
+M	src/core/SourceInterfaces.vala
+M	src/photos/PhotoMetadata.vala
+
+commit 719fc9935a3f8c36009e028e8e893347e0b730ab
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Dec 31 00:41:06 2016 +0100
+
+    Fix actions for fullscreen
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776614
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/CollectionPage.vala
+M	src/MediaPage.vala
+M	src/Page.vala
+M	src/PhotoPage.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/searches/SavedSearchPage.vala
+M	src/tags/TagPage.vala
+
+commit 0f3a1eee7ab9ce0ce211227e695e197bba53188a
+Author: Dušan Kazik <prescott66@gmail.com>
+Date:	Sun Jan 1 20:01:53 2017 +0000
+
+    Update Slovak translation
+
+M	po/sk.po
+
+commit b24bde8bbcc42aac8cd5e5390db12cd3fb08725a
+Author: Dušan Kazik <prescott66@gmail.com>
+Date:	Sun Jan 1 19:37:20 2017 +0000
+
+    Update Slovak translation
+    (cherry picked from commit 3e41d1eab5df8a0693946bb22406c886f2799e7a)
+
+M	po/sk.po
+
+commit 6c2eea964babf24a9901f9569a32247282cfe40c
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Dec 31 00:39:51 2016 +0100
+
+    Fix action state when switching back in library
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776527
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Page.vala
+
+commit f98a958b83245c9ced25e4c646c0de83a6bb0d1d
+Author: Richard B. Kreckel <kreckel@ginac.de>
+Date:	Thu Dec 29 18:47:00 2016 +0000
+
+    Import button labels are swapped
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776589
+
+M	src/camera/ImportPage.vala
+
+commit 092a86ec0c9901385c257cd84eb178469da01b65
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 28 00:08:16 2016 +0100
+
+    Remove local actions from Page when switching away
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776527
+
+M	src/CollectionPage.vala
+M	src/MediaPage.vala
+M	src/Page.vala
+M	src/PhotoPage.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/OfflinePage.vala
+M	src/library/TrashPage.vala
+M	src/searches/SavedSearchPage.vala
+M	src/tags/TagPage.vala
+
+commit 6fc591233cfc6e1ca690c3a637b8e21bb3d47f65
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 28 12:45:05 2016 +0100
+
+    Revert "Remove deprecated Soup API"
+
+    Breaks flick upload
+
+    This reverts commit 8999db51f67aeab1507d182742adc689dfbd9bb1.
+
+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 587ce09a54124839697ee178334eaa3cd4843c46
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Wed Dec 28 11:37:04 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit acbe3c3e5bb00996536e7a8f449ed45c95271d93
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 27 19:38:43 2016 +0100
+
+    Fix LeaveFullscreen action
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+
+commit f74c9b715553cd3a6b85e8707d0112f2310626e8
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:	Mon Dec 26 09:09:24 2016 +0000
+
+    Update Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit b212f161c6745914a91158b15eb83253f8ceaec9
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Dec 25 21:38:13 2016 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 7ed7d8c8d10d95b8dd76bce3a4a8856b5c478c03
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Dec 25 21:37:09 2016 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit cb09b73d966f7876ac97041f2815a0561175316f
+Author: Marek Černocký <marek@manet.cz>
+Date:	Sat Dec 24 14:47:04 2016 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit d94d02049889b72fd653ab22e790cb0a7949f86a
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Fri Dec 23 01:17:49 2016 +0100
+
+    Update POTFILES.in
+
+M	po/POTFILES.in
+
+commit 235c28bccd1f0f8f5277e1d792bcfd9a04f0b31e
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 22:17:14 2016 +0100
+
+    flickr: Use format_size_full for the remaining quota string
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+
+commit e8622e25c3753fb9191e871c479685bc036fecb6
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 21:08:18 2016 +0100
+
+    Revert "Use AppMenu"
+
+    Not good. Help is not easily discoverable. Needs some more thinking
+
+    This reverts commit 6e6a51b3a5b939322e0a40c2f2766367969721c2.
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/Application.vala
+M	src/direct/DirectWindow.vala
+M	src/library/LibraryWindow.vala
+M	ui/Makefile.am
+D	ui/appmenu.ui
+M	ui/direct.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/tags.ui
+M	ui/trash.ui
+
+commit 248bb1463f967073df05228c37b0410de7506d52
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 21:07:09 2016 +0100
+
+    Revert "Add Quit menu item to File menu"
+
+    This reverts commit 0fa222a858adee5014c91dd2a8de0658b3a4ec24.
+
+M	src/Page.vala
+M	ui/direct.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/tags.ui
+M	ui/trash.ui
+
+commit b9feec526de83b4ad94a7dacc8916a9c65967841
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Thu Dec 22 16:47:54 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit a9e4ef6df60822cf2feb8eb621f81d82504e4806
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 13:23:30 2016 +0100
+
+    Add <Ctrl>-f as shortcut for search bar
+
+    As mentioned in the documentation
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/library/LibraryWindow.vala
+
+commit f576f5956f71dccf6ef127fccc9940824a8dd9d5
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 13:23:11 2016 +0100
+
+    Accellerators need to be null-terminated
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+
+commit 684eb82f81d90947f0c0b5bb26d12a5f3cc6b74b
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 21 15:15:27 2016 +0100
+
+    flickr: Simplify OAuth result parsing
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+
+commit 95d62f14086662dc97684d13cf34e6eb53868812
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 21 12:26:09 2016 +0100
+
+    yandex: Update glade file
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/yandex_publish_model.ui
+
+commit e6b9ffe51765e616b388232a338a437809687eaf
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 21 12:17:13 2016 +0100
+
+    tumblr: Update glade files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+M
+plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+
+commit 6fb98fbc7ec5c97486600961502db8cc961130d1
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 21 12:06:26 2016 +0100
+
+    rajce: Update glade files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+M
+plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
+
+commit d5f2b6505c61dc9dfab71392534a91a6ecc242b1
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 21 11:52:19 2016 +0100
+
+    gallery3: Update glade files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+M
+plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+
+commit 5dad7406da9c1c3adc63c57e508de06cd86b3a2c
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 20 21:24:18 2016 +0100
+
+    piwigo: Update glade files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/piwigo_authentication_pane.ui
+M	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+M	plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
+
+commit d24ea86ff22911454b26157d223377bec498fe88
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 20 21:23:56 2016 +0100
+
+    picasa: Update glade file
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/picasa_publishing_options_pane.ui
+
+commit 68b0fb3debbcce1e3683f732a40ef771f56b6a21
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 20 21:19:36 2016 +0100
+
+    facebook: Update publishing pane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/facebook_publishing_options_pane.ui
+
+commit c4eac442dea23bc35c772250e27bfa7226067a79
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 20 20:59:29 2016 +0100
+
+    flickr: Update glade files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+M	plugins/shotwell-publishing/flickr_publishing_options_pane.ui
+
+commit eb8612cd6fafcac7d42baacd33697958e198941e
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 20 13:28:13 2016 +0100
+
+    Fix toolbar in camera import page
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=776298
+
+M	src/Resources.vala
+M	src/camera/ImportPage.vala
+
+commit 021d6bc3a0540b5a8cb3b752faa22f5b7e688c4e
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Tue Dec 20 12:17:48 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit 0fa222a858adee5014c91dd2a8de0658b3a4ec24
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 18 20:05:44 2016 +0100
+
+    Add Quit menu item to File menu
+
+    If the shell does have AppMenu. Not having itbroke my workflow
+    quite badly.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Page.vala
+M	ui/direct.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/tags.ui
+M	ui/trash.ui
+
+commit 9df5346f7428d3359e22c8281e1572adad85e7c9
+Author: Marek Černocký <marek@manet.cz>
+Date:	Sat Dec 17 17:02:59 2016 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 3591a7977872b7134afd76bb94e847d115784f11
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 23:11:51 2016 +0100
+
+    Fix item in Tag page context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/tags.ui
+
+commit a4e8bd539157381f8bd962b017b2d9966df6cada
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 23:11:32 2016 +0100
+
+    Fix actions on sidebar context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/sidebar_default_context.ui
+M	ui/tag_sidebar_context.ui
+
+commit fdf099ed0902a2b7553ee78b17a548e1b560f8de
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 23:11:14 2016 +0100
+
+    Fix critical when re-using popup menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/sidebar/Tree.vala
+
+commit ae78abb368cf0928e47fc28756a3675b5de5872c
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 22:22:33 2016 +0100
+
+    Fix rating action
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/SearchFilter.vala
+M	ui/import.ui
+M	ui/offline.ui
+M	ui/trash.ui
+
+commit 5fea37e591b98968121dbc05679c0a5e8755fb74
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 22:16:01 2016 +0100
+
+    Hack to switch menubar in the application window
+
+    Apparently the Gtk.ApplicationWindow only reloads the menu bar
+    from the
+    Application if the gtk-shell-shows-menubar property changes
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/library/LibraryWindow.vala
+
+commit 48a0f15cf9c76ee91e8c85b2625099daa53db303
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 16 21:31:32 2016 +0100
+
+    Add missing tags context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/tags.ui
+
+commit da0e59545f50f2545a8c6f5619a3e0f7f0b25b04
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 15 08:57:01 2016 +0100
+
+    Guess convert when UTF-8 validation fails
+
+    If validation of a text is requested and it fails, try to convert from
+    current locale if not UTF-8, otherwise fall-back to windows-1252 and
+    iso-8859-1.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=718107
+
+M	src/util/string.vala
+
+commit 3da461946b4148d338fc9b9a116191ef7ad85bc6
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Thu Dec 15 08:39:08 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit 057c8d8a470db9f971225c4e866de82b964433d1
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 13 19:25:47 2016 +0100
+
+    Fix event page context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/events/EventPage.vala
+
 commit e2940082c6e44526d9494a13443064f544a597ba
 Author: Jens Georg <mail@jensge.org>
-Date:   Mon Dec 12 18:19:56 2016 +0100
+Date:	Mon Dec 12 18:19:56 2016 +0100
 
     Prepare 0.25.2
 
diff --git a/Makefile.in b/Makefile.in
index 753e7bb..da1b721 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6937,35 +6937,6 @@ $(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-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
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.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
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.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
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.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
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.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
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
-	fi
-$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
-	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -7040,6 +7011,30 @@ $(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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_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_common_libshotwell_plugin_common_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_common_libshotwell_plugin_common_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_common_libshotwell_plugin_common_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/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_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-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 \
@@ -7099,29 +7094,58 @@ $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugi
 	$(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_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)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_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)/src_plugins_libplugin_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)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_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)/src_plugins_libplugin_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)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_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)/src_plugins_libplugin_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
+$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_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)/src_plugins_libplugin_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/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
 	$(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/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
+	$(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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+	fi
+$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@@ -7157,30 +7181,6 @@ $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
-	fi
-$(srcdir)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
-	fi
-$(srcdir)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
-	fi
-$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
-	fi
-$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
-	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/NEWS b/NEWS
index 69db0a7..280f583 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,60 @@
+Shotwell 0.25.3 - 16 Jan 2017
+  * Fix event page context menu
+  * Try to guess character set of string when UTF-8 validation fails
+  * Fix tags context menu
+  * Properly switch menu bar when changing pages
+  * Fix rating
+  * Fix a critical about reparenting a popup menu
+  * Fix sidebar context menu
+  * Fix toolbar in camera import page
+  * Update glade files for all publishers
+  * Flickr: Simplify OAuth parsing by using libsoup
+  * Fix accellerators not coming from menu model
+  * Add <Ctrl>-f as shortcut for search bar
+  * Remove AppMenu, needs more thinking about the design.
+  * Flickr: Use human-readable size of upload quota
+  * Fix leave fullscreen option
+  * Fix upload issues with flickr
+  * Fix several disabled actions when switching away from pages
+  * Fix actions in fullscreen
+  * Fix several typos
+  * Piwigo: Fix title and comments on upload
+  * Improved duplicate detection
+  * Updated translations
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718107
+ - https://bugzilla.gnome.org/show_bug.cgi?id=775196
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776298
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776527
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776589
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776614
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776664
+ - https://bugzilla.gnome.org/show_bug.cgi?id=776839
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Marina Prado <mapraro93@hotmail.com>
+ - Richard B. Kreckel <kreckel@ginac.de>
+ - Marek Černocký <marek@manet.cz>
+ - Dušan Kazik <prescott66@gmail.com>
+ - Rafael Fontenelle <rafaelff@gnome.org>
+ - Andreas Brauchli <andreas.brauchli@sensirion.com>
+ - Amos Brocco <amos.brocco@gmail.com>
+ - Alan Mortensen <alanmortensen.am@gmail.com>
+
+Added/updated translations
+ - cs, courtesy of Marek Černocký
+ - da, courtesy of Alan Mortensen
+ - es, courtesy of Daniel Mustieles
+ - ko, courtesy of Kim Boram
+ - pl, courtesy of Piotr Drąg
+ - pt_BR, courtesy of Rafael Fontenelle
+ - sk, courtesy of Dušan Kazik
+ - sr, courtesy of Мирослав Николић
+ - sr@latin, courtesy of Miroslav Nikolić
+
 Shotwell 0.25.2 - 12 Dec 2016
   * Fix missing About action
   * Fix setting of initial action state
diff --git a/configure b/configure
index 0b40d5c..a73ddfe 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.2.
+# Generated by GNU Autoconf 2.69 for shotwell 0.25.3.
 #
 # 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.2'
-PACKAGE_STRING='shotwell 0.25.2'
+PACKAGE_VERSION='0.25.3'
+PACKAGE_STRING='shotwell 0.25.3'
 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.2 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.25.3 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.2:";;
+     short | recursive ) echo "Configuration of shotwell 0.25.3:";;
    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.2
+shotwell configure 0.25.3
 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.2, which was
+It was created by shotwell $as_me 0.25.3, 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=2
+MICRO_VERSION=3
 
 API_VERSION=0
 
 
-GITVER=e2940082c6e44526d9494a13443064f544a597ba
+GITVER=e5a192163148d01708684bc38c4442824fda8178
 
 
  if test "x$GITVER" != "x"; then
@@ -2962,7 +2962,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.25.2'
+ VERSION='0.25.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -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.2, which was
+This file was extended by shotwell $as_me 0.25.3, 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.2
+shotwell config.status 0.25.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 86c0a1c..3977890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
 m4_define([minor_version],[25])
-m4_define([micro_version],[2])
+m4_define([micro_version],[3])
 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])
diff --git a/help/es/edit-date-time.page b/help/es/edit-date-time.page
index acc0323..98b49eb 100644
--- a/help/es/edit-date-time.page
+++ b/help/es/edit-date-time.page
@@ -3,7 +3,7 @@
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Change the date and time of photos if those details are incorrect.</desc>
+        <desc>Cambiar la hora y la fecha de las fotos si son incorrectas.</desc>
 
         <link type="next" xref="edit-enhance"/>
     
@@ -26,9 +26,9 @@
     </mal:credit>
   </info>
 
-	<title>Adjust the date and time of photos</title>
+	<title>Ajustar la hora y fecha de las fotos</title>
 
-<p>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.</p>
+<p>Para ajustar la hora y fecha de las fotos, seleccione las fotos que quiere ajustar y pulse <guiseq><gui>Fotos</gui><gui>Ajustar fecha y hora...</gui></guiseq> y seleccione una nueva fecha y hora.</p>
 
 <p>Si está cambiando la fecha y la hora de varias fotos a la vez, puede elegir cambiar todas las fotos en la misma cantidad de horas o establecer todas las fotos en la misma hora.</p>
 
diff --git a/help/es/edit-straighten.page b/help/es/edit-straighten.page
index 269d6dc..4516d61 100644
--- a/help/es/edit-straighten.page
+++ b/help/es/edit-straighten.page
@@ -38,7 +38,7 @@
       <p>Arrastre el control deslizante para conseguir el grado que quiera de enderezamiento.</p>
      </item>
      <item>
-      <p>Press <gui>Straighten</gui> when finished.</p>
+      <p>Pulse <gui>Enderezar</gui> cuando haya acabado.</p>
      </item>
  </steps>
 
diff --git a/help/es/es.po b/help/es/es.po
index ca61133..e653ecb 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -7,3204 +7,3323 @@
 # 
 # 
 # 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
-, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2016-12-08 19:26+0000\n"
-"PO-Revision-Date: 2016-12-12 16:08+0100\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 ""
-"Cuando complete sus ediciones y guarde el archivo, Shotwell detectará los "
-"cambios y actualizará la foto. Cuando se hayan realizado ediciones externas, "
-"mantenga pulsada la tecla <tecla>Mayús</tecla> en la vista de la pantalla "
-"completa para mostrar la foto original en lugar de la editada externamente."
-
-#. (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 ""
-"Si edita de manera externa una foto RAW y guarda el resultado en otra "
-"imagen, como un archivo JPEG o PNG, Shotwell no puede determinar "
-"automáticamente que la RAW original y la nueva imagen deberían estar "
-"emparejadas."
-
-#. (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 ""
-"Si quiere trabajar sobre la imagen resultante con Shotwell, tendrá que "
-"importarla usted mismo."
-
-#. (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 es un editor de fotos no destructivo, es decir, no modifica sus "
-"fotos originales."
-
-#. (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 ""
-"Shotwell es un editor de fotos no destructivo. No modifica sus fotografías "
-"originales. Es decir, si recorta una foto o ajusta sus colores, el archivo "
-"de la foto del disco permanece intacto. Shotwell almacena sus ediciones en "
-"una base de datos y las aplica sobre la marcha, según sea necesario. Esto "
-"significa que puede deshacer cualquier alteración que realices en una "
-"fotografía."
-
-#. (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 ""
-"Si quiere ver qué aspecto tenía una foto antes de realizar las "
-"modificaciones, pulse la tecla <tecla>Mayús<tecla>. La foto original se "
-"mostrará siempre que mantenga pulsada esta tecla."
-
-#. (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 ""
-"Tenga en cuenta que Shotwell puede escribir metadatos opcionalmente (como "
-"etiquetas y títulos) en los archivos de fotos. Para obtener más información, "
-"consulte la sección <link xref=\"other-files\">Archivos de fotos</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 ""
-"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 ""
-"Los ojos rojos aparecen cuando el flash de la cámara se refleja en las "
-"pupilas de los ojos. Para eliminar esto en una foto, utilice la herramienta "
-"Ojos rojos."
-
-#. (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 ""
-"Arrastre el círculo sobre la pupila afectada, ajuste su tamaño con el "
-"control deslizante y presione <gui>Aplicar</gui>. Se eliminará el color rojo."
-
-#. (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 ""
-"Repita este proceso para todas las pupilas rojas en su foto. Pulse "
-"<gui>Cerrar</gui> cuando haya terminado."
-
-#. (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 ""
-"Puede girar las fotos a la izquierda y a la derecha con el botón <gui>Girar</"
-"gui> en la barra de herramientas de la mayoría de las vistas. También puede "
-"hacer una imagen reflejada de cualquier foto."
-
-#. (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 ""
-"Para girar hacia la derecha, pulse el botón <gui>Girar</gui>. Para girar "
-"hacia la izquierda, mantenga pulsada la tecla <tecla>Ctrl</key> y luego "
-"pulse el botón. Ambos comandos están disponibles en el menú <gui>Fotos</"
-"gui>. Como alternativa, utilice los siguientes atajos del teclado:"
-
-#. (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 ""
-"Para crear una imagen reflejada de una foto, utilice el comando <gui>Voltear "
-"horizontalmente</gui> en el menú <gui>Fotos</gui>. Para voltear una imagen "
-"verticalmente, utilice el comando <gui>Voltear verticalmente</gui> en el "
-"mismo menú."
-
-#. (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 ""
-"Las herramientas de enderezar permiten que las fotos se nivelen y enderecen. "
-"La herramienta de enderezado sólo está disponible en modo de pantalla "
-"completa."
-
-#. (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 ""
-"Pulse en <gui>Enderezar</gui>. Aparecerá el control deslizante de "
-"enderezamiento. También puede utilizar el atajo de teclado "
-"<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 ""
-"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 ""
-"Si está cambiando la fecha y la hora de varias fotos a la vez, puede elegir "
-"cambiar todas las fotos en la misma cantidad de horas o establecer todas las "
-"fotos en la misma hora."
-
-#. (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 ""
-"De manera predeterminada, la fecha y la hora sólo se cambian dentro de "
-"Shotwell. También puede optar por modificar la fecha y la hora en el archivo "
-"original, pero esto no se puede deshacer una vez que salga de Shotwell."
-
-#. (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 ""
-"Gracias a que Shotwell es un editor de fotos no destructivo, puede deshacer "
-"cualquier alteración que realice en una foto."
-
-#. (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 ""
-"Para deshacer por completo todos los cambios realizados en una foto, haga "
-"clic en <guiseq><gui>Fotos</gui><gui>Volver al original</gui></guiseq>. La "
-"única excepción es que los ajustes de hora y fecha no se revertirán."
-
-#. (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 soporta archivos JPEG, PNG, TIFF, BMP y RAW, así como archivos de "
-"vídeo."
-
-#. (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 ""
-"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y <link type =\"guide\" xref="
-"\"other-raw\">RAW</link>. Shotwell todavía no soporta otros formatos "
-"gráficos como 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 ""
-"El soporte del formato RAW de Shotwell está actualmente limitado. Cuando ve "
-"una foto RAW, en realidad está viendo un JPEG derivado de la foto RAW, no la "
-"imagen RAW en sí. Además, la ruta de edición RAW no es completamente de 16 "
-"bits; sólo puede exportar las fotos editadas como archivos de 8 bits. Todos "
-"los formatos compatibles se pueden utilizar para la exportación (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 ""
-"Para obtener más información acerca de las fotos en formato RAW en Shotwell, "
-"consulte la sección <link type=\"guide\" xref=\"other-raw\">RAW</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 también soporta archivos de vídeo en cualquier formato soportado "
-"por la biblioteca multimedia de GStreamer en el sistema donde Shotwell está "
-"funcionando. Esto normalmente incluye los siguientes formatos, entre otros:"
-
-#. (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 ""
-"Códecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Tenga en cuenta que "
-"algunos sistemas operativos pueden no incluir todos los códecs que se "
-"enumeran aquí debido a restricciones legales o de licencia.</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 soporta fotos y vídeos, pero por simplicidad, esta documentación "
-"usa sólo el término «fotos» en la mayoría de ocasiones. Sin embargo, muchas "
-"operaciones en Shotwell se aplican tanto a fotos como a vídeos. En "
-"particular, los eventos, los marcados, las clasificaciones, los etiquetados "
-"y los trabajos publicados funcionan tanto para fotos como para vídeos."
-
-#. (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 ""
-"Si quiere, puede elegir un conjunto de fotos específicas para importar. Para "
-"ello, mantenga presionada la tecla <tecla>Ctrl</key> y pulse para "
-"seleccionar las fotos individuales. Puede mantener pulsada la tecla "
-"<tecla>Mayús</tecla> y pulsar para seleccionar varias fotos también."
-
-#. (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 ""
-"Pulse <gui>Importar seleccionadas</gui> o <gui> Importar todo</gui>. Las "
-"fotos se copiarán de la cámara y se guardarán en el ordenador."
-
-#. (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 ""
-"Una vez finalizada la importación, puede abrir la vista <gui>Última "
-"importación</gui> (en la barra lateral) para ver todas las fotos que se "
-"importaron. La lista de Eventos (también en la barra lateral) también "
-"mostrará las nuevas fotos, organizadas por fecha."
-
-#. (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 ""
-"Alternativamente, pulse <guiseq><gui>Archivo</gui><gui>Importar desde la "
-"carpeta...</gui></guiseq> y seleccione la carpeta que contiene las fotos que "
-"quiere importar."
-
-#. (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 le preguntará si quiere copiar los archivos de fotos en su carpeta "
-"de la biblioteca (la carpeta de la biblioteca está normalmente en la carpeta "
-"<file>Imágenes</file> en su carpeta local) o importarlos en su lugar sin "
-"copiar los archivos."
-
-#. (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 ""
-"Si mantiene pulsada la tecla <key>Ctrl</key> mientras arrastra las fotos, "
-"Shotwell copiará las fotos en la carpeta de la biblioteca sin preguntar. Del "
-"mismo modo, si mantiene presionadas las teclas <keyseq><key>Ctrl</"
-"key><key>Shift</key></keyseq>, Shotwell importará las fotos sin copiarlas."
-
-#. (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 ""
-"Una vez finalizada la importación, puede seleccionar <gui>Última "
-"importación</gui> en la barra lateral para ver todas las fotos importadas "
-"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
-"fechas correspondientes a las fotos importadas."
-
-#. (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 ""
-"Ahora elija la biblioteca predeterminada F-Spot u otra base de datos F-Spot. "
-"Si quiere importar desde otra base de datos F-Spot, seleccione una carpeta y "
-"un archivo en el cuadro de diálogo del selector."
-
-#. (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 importará sus fotos, junto con sus etiquetas y otra información. "
-"Una vez finalizada la importación, puede seleccionar <gui>Última "
-"importación</gui> en la barra lateral para ver todas las fotos importadas "
-"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
-"fechas correspondientes a las fotos importadas."
-
-#. (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 ""
-"Siga las instrucciones para <link xref=\"import-file\">importar fotos desde "
-"el disco duro</link>. Si pulsa en <guiseq><gui>Archivo</gui><gui>Importar "
-"desde la carpeta...</gui></guiseq>, la tarjeta de memoria será visible como "
-"una carpeta en la barra lateral de la ventana de selección de archivos."
-
-#. (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 ""
-"Si la tarjeta no se detecta automáticamente, es posible que su lector de "
-"tarjetas no se haya reconocido. Intente desenchufarlo y vuelva a enchufarlo. "
-"Sin embargo, si eso no funciona, podrá importar fotos mediante <link xref="
-"\"import-camera\">conectar su cámara directamente al ordenador</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\"/>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 ""
-"Un evento es un grupo de fotos que se han hecho aproximadamente al mismo "
-"tiempo. Cuando importa fotos, Shotwell comprueba cuándo se hizo cada foto y "
-"las agrupa por eventos."
-
-#. (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 ""
-"Elija <gui>Eventos</gui> en la barra lateral para ver sus fotos organizadas "
-"por fecha. Si selecciona un mes o un año en la barra lateral, se mostrará "
-"una lista de eventos en la ventana principal. Pulse dos veces en un evento "
-"para ver todas las fotos tomadas en ese momento."
-
-#. (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 ""
-"Si una foto no tiene información insertada de la fecha o la hora, entonces "
-"Shotwell no puede colocarla automáticamente en ningún evento. En este caso, "
-"la foto aparecerá en la vista <gui>No hay eventos</gui> a la que se accede "
-"desde la barra lateral. Todavía puede mover la foto a cualquier evento que "
-"quiera como se describe a continuación."
-
-#. (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 ""
-"Para dar un nombre a un evento en lugar de referirse a él por su fecha, "
-"seleccione el evento, pulse en <guiseq><gui>Eventos</gui><gui>Renombrar "
-"evento...</gui></guiseq> e introduzca un nuevo nombre. Otra forma de cambiar "
-"el nombre de un evento es pulsar dos veces en su nombre en la barra lateral; "
-"Escriba un nuevo nombre y luego pulse <key>Intro</key>."
-
-#. (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 ""
-"Aunque las fotos se agrupan inicialmente por eventos según su fecha, puede "
-"mover fotos entre eventos. Para ello, arrastre cualquier foto a la barra "
-"lateral y suéltela en un evento."
-
-#. (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 ""
-"Para combinar eventos, seleccione <guiseq><gui>Eventos</gui></guiseq> de la "
-"barra lateral, luego, mientras presiona <key>Ctrl</key> pulse en los eventos "
-"que quiere combinar en la ventana principal. Finalmente, pulse en "
-"<guiseq><gui>Eventos</gui><gui>Combinar eventos</gui></guiseq>."
-
-#. (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 ""
-"Los eventos se muestran en la estructura de árbol en la barra lateral, "
-"organizados por el año y el mes de la primera foto del evento. Para cambiar "
-"el orden de clasificación del evento, pulse en <guiseq><gui>Vista</"
-"gui><gui>Ordenar eventos</gui></guiseq> y seleccione si quiere el orden "
-"ascendente o descendente."
-
-#. (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 ""
-"De manera predeterminada, Shotwell utiliza la primera foto de cada evento "
-"como su vista de miniatura. Para utilizar una foto distinta, seleccione la "
-"foto y elija <guiseq><gui>Fotos</gui><gui>Definir vista de miniatura de "
-"eventos </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 ""
-"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 ""
-"Shotwell le permite <em>marcar</em> sus fotos. Cuando se marca una foto, "
-"aparece un pequeño icono de una bandera en su esquina superior derecha. "
-"Puede seleccionar el elemento <gui>Marcada</gui> en la barra lateral para "
-"ver todas las fotos que se han marcado."
-
-#. (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 "Tí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 "Mié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"
+# 
+# 
+# 
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: shotwell master\n"
+"POT-Creation-Date: 2016-12-23 00:18+0000\n"
+"PO-Revision-Date: 2016-12-23 \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 ""
+"Cuando complete sus ediciones y guarde el archivo, Shotwell detectará los "
+"cambios y actualizará la foto. Cuando se hayan realizado ediciones externas, "
+"mantenga pulsada la tecla <tecla>Mayús</tecla> en la vista de la pantalla "
+"completa para mostrar la foto original en lugar de la editada externamente."
+
+#. (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 ""
+"Si edita de manera externa una foto RAW y guarda el resultado en otra "
+"imagen, como un archivo JPEG o PNG, Shotwell no puede determinar "
+"automáticamente que la RAW original y la nueva imagen deberían estar "
+"emparejadas."
+
+#. (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 ""
+"Si quiere trabajar sobre la imagen resultante con Shotwell, tendrá que "
+"importarla usted mismo."
+
+#. (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 es un editor de fotos no destructivo, es decir, no modifica sus "
+"fotos originales."
+
+#. (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 ""
+"Shotwell es un editor de fotos no destructivo. No modifica sus fotografías "
+"originales. Es decir, si recorta una foto o ajusta sus colores, el archivo "
+"de la foto del disco permanece intacto. Shotwell almacena sus ediciones en "
+"una base de datos y las aplica sobre la marcha, según sea necesario. Esto "
+"significa que puede deshacer cualquier alteración que realices en una "
+"fotografía."
+
+#. (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 ""
+"Si quiere ver qué aspecto tenía una foto antes de realizar las "
+"modificaciones, pulse la tecla <tecla>Mayús<tecla>. La foto original se "
+"mostrará siempre que mantenga pulsada esta tecla."
+
+#. (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 ""
+"Tenga en cuenta que Shotwell puede escribir metadatos opcionalmente (como "
+"etiquetas y títulos) en los archivos de fotos. Para obtener más información, "
+"consulte la sección <link xref=\"other-files\">Archivos de fotos</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 ""
+"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 ""
+"Los ojos rojos aparecen cuando el flash de la cámara se refleja en las "
+"pupilas de los ojos. Para eliminar esto en una foto, utilice la herramienta "
+"Ojos rojos."
+
+#. (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 ""
+"Arrastre el círculo sobre la pupila afectada, ajuste su tamaño con el "
+"control deslizante y presione <gui>Aplicar</gui>. Se eliminará el color rojo."
+
+#. (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 ""
+"Repita este proceso para todas las pupilas rojas en su foto. Pulse "
+"<gui>Cerrar</gui> cuando haya terminado."
+
+#. (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 ""
+"Puede girar las fotos a la izquierda y a la derecha con el botón <gui>Girar</"
+"gui> en la barra de herramientas de la mayoría de las vistas. También puede "
+"hacer una imagen reflejada de cualquier foto."
+
+#. (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 ""
+"Para girar hacia la derecha, pulse el botón <gui>Girar</gui>. Para girar "
+"hacia la izquierda, mantenga pulsada la tecla <tecla>Ctrl</key> y luego "
+"pulse el botón. Ambos comandos están disponibles en el menú <gui>Fotos</"
+"gui>. Como alternativa, utilice los siguientes atajos del teclado:"
+
+#. (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 ""
+"Para crear una imagen reflejada de una foto, utilice el comando <gui>Voltear "
+"horizontalmente</gui> en el menú <gui>Fotos</gui>. Para voltear una imagen "
+"verticalmente, utilice el comando <gui>Voltear verticalmente</gui> en el "
+"mismo menú."
+
+#. (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 ""
+"Las herramientas de enderezar permiten que las fotos se nivelen y enderecen. "
+"La herramienta de enderezado sólo está disponible en modo de pantalla "
+"completa."
+
+#. (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 ""
+"Pulse en <gui>Enderezar</gui>. Aparecerá el control deslizante de "
+"enderezamiento. También puede utilizar el atajo de teclado "
+"<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 ""
+"Arrastre el control deslizante para conseguir el grado que quiera de "
+"enderezamiento."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:24
+msgid "Press <gui>Straighten</gui> when finished."
+msgstr "Pulse <gui>Enderezar</gui> cuando haya acabado."
+
+#. (itstool) path: info/desc
+#: C/edit-date-time.page:7
+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
+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
+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 ajustar la hora y fecha de las fotos, seleccione las fotos que quiere "
+"ajustar y pulse <guiseq><gui>Fotos</gui><gui>Ajustar fecha y hora...</gui></"
+"guiseq> y seleccione una nueva fecha y hora."
+
+#. (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 ""
+"Si está cambiando la fecha y la hora de varias fotos a la vez, puede elegir "
+"cambiar todas las fotos en la misma cantidad de horas o establecer todas las "
+"fotos en la misma hora."
+
+#. (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 ""
+"De manera predeterminada, la fecha y la hora sólo se cambian dentro de "
+"Shotwell. También puede optar por modificar la fecha y la hora en el archivo "
+"original, pero esto no se puede deshacer una vez que salga de Shotwell."
+
+#. (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 ""
+"Gracias a que Shotwell es un editor de fotos no destructivo, puede deshacer "
+"cualquier alteración que realice en una foto."
+
+#. (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 ""
+"Para deshacer por completo todos los cambios realizados en una foto, haga "
+"clic en <guiseq><gui>Fotos</gui><gui>Volver al original</gui></guiseq>. La "
+"única excepción es que los ajustes de hora y fecha no se revertirán."
+
+#. (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 soporta archivos JPEG, PNG, TIFF, BMP y RAW, así como archivos de "
+"vídeo."
+
+#. (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 ""
+"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y <link type =\"guide\" xref="
+"\"other-raw\">RAW</link>. Shotwell todavía no soporta otros formatos "
+"gráficos como 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 ""
+"El soporte del formato RAW de Shotwell está actualmente limitado. Cuando ve "
+"una foto RAW, en realidad está viendo un JPEG derivado de la foto RAW, no la "
+"imagen RAW en sí. Además, la ruta de edición RAW no es completamente de 16 "
+"bits; sólo puede exportar las fotos editadas como archivos de 8 bits. Todos "
+"los formatos compatibles se pueden utilizar para la exportación (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 ""
+"Para obtener más información acerca de las fotos en formato RAW en Shotwell, "
+"consulte la sección <link type=\"guide\" xref=\"other-raw\">RAW</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 también soporta archivos de vídeo en cualquier formato soportado "
+"por la biblioteca multimedia de GStreamer en el sistema donde Shotwell está "
+"funcionando. Esto normalmente incluye los siguientes formatos, entre otros:"
+
+#. (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 ""
+"Códecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Tenga en cuenta que "
+"algunos sistemas operativos pueden no incluir todos los códecs que se "
+"enumeran aquí debido a restricciones legales o de licencia.</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 soporta fotos y vídeos, pero por simplicidad, esta documentación "
+"usa sólo el término «fotos» en la mayoría de ocasiones. Sin embargo, muchas "
+"operaciones en Shotwell se aplican tanto a fotos como a vídeos. En "
+"particular, los eventos, los marcados, las clasificaciones, los etiquetados "
+"y los trabajos publicados funcionan tanto para fotos como para vídeos."
+
+#. (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 ""
+"Si quiere, puede elegir un conjunto de fotos específicas para importar. Para "
+"ello, mantenga presionada la tecla <tecla>Ctrl</key> y pulse para "
+"seleccionar las fotos individuales. Puede mantener pulsada la tecla "
+"<tecla>Mayús</tecla> y pulsar para seleccionar varias fotos también."
+
+#. (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 ""
+"Pulse <gui>Importar seleccionadas</gui> o <gui> Importar todo</gui>. Las "
+"fotos se copiarán de la cámara y se guardarán en el ordenador."
+
+#. (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 ""
+"Una vez finalizada la importación, puede abrir la vista <gui>Última "
+"importación</gui> (en la barra lateral) para ver todas las fotos que se "
+"importaron. La lista de Eventos (también en la barra lateral) también "
+"mostrará las nuevas fotos, organizadas por fecha."
+
+#. (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 ""
+"Alternativamente, pulse <guiseq><gui>Archivo</gui><gui>Importar desde la "
+"carpeta...</gui></guiseq> y seleccione la carpeta que contiene las fotos que "
+"quiere importar."
+
+#. (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 le preguntará si quiere copiar los archivos de fotos en su carpeta "
+"de la biblioteca (la carpeta de la biblioteca está normalmente en la carpeta "
+"<file>Imágenes</file> en su carpeta local) o importarlos en su lugar sin "
+"copiar los archivos."
+
+#. (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 ""
+"Si mantiene pulsada la tecla <key>Ctrl</key> mientras arrastra las fotos, "
+"Shotwell copiará las fotos en la carpeta de la biblioteca sin preguntar. Del "
+"mismo modo, si mantiene presionadas las teclas <keyseq><key>Ctrl</"
+"key><key>Shift</key></keyseq>, Shotwell importará las fotos sin copiarlas."
+
+#. (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 ""
+"Una vez finalizada la importación, puede seleccionar <gui>Última "
+"importación</gui> en la barra lateral para ver todas las fotos importadas "
+"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
+"fechas correspondientes a las fotos importadas."
+
+#. (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 ""
+"Ahora elija la biblioteca predeterminada F-Spot u otra base de datos F-Spot. "
+"Si quiere importar desde otra base de datos F-Spot, seleccione una carpeta y "
+"un archivo en el cuadro de diálogo del selector."
+
+#. (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 importará sus fotos, junto con sus etiquetas y otra información. "
+"Una vez finalizada la importación, puede seleccionar <gui>Última "
+"importación</gui> en la barra lateral para ver todas las fotos importadas "
+"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
+"fechas correspondientes a las fotos importadas."
+
+#. (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 ""
+"Siga las instrucciones para <link xref=\"import-file\">importar fotos desde "
+"el disco duro</link>. Si pulsa en <guiseq><gui>Archivo</gui><gui>Importar "
+"desde la carpeta...</gui></guiseq>, la tarjeta de memoria será visible como "
+"una carpeta en la barra lateral de la ventana de selección de archivos."
+
+#. (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 ""
+"Si la tarjeta no se detecta automáticamente, es posible que su lector de "
+"tarjetas no se haya reconocido. Intente desenchufarlo y vuelva a enchufarlo. "
+"Sin embargo, si eso no funciona, podrá importar fotos mediante <link xref="
+"\"import-camera\">conectar su cámara directamente al ordenador</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\"/>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 ""
+"Un evento es un grupo de fotos que se han hecho aproximadamente al mismo "
+"tiempo. Cuando importa fotos, Shotwell comprueba cuándo se hizo cada foto y "
+"las agrupa por eventos."
+
+#. (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 ""
+"Elija <gui>Eventos</gui> en la barra lateral para ver sus fotos organizadas "
+"por fecha. Si selecciona un mes o un año en la barra lateral, se mostrará "
+"una lista de eventos en la ventana principal. Pulse dos veces en un evento "
+"para ver todas las fotos tomadas en ese momento."
+
+#. (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 ""
+"Si una foto no tiene información insertada de la fecha o la hora, entonces "
+"Shotwell no puede colocarla automáticamente en ningún evento. En este caso, "
+"la foto aparecerá en la vista <gui>No hay eventos</gui> a la que se accede "
+"desde la barra lateral. Todavía puede mover la foto a cualquier evento que "
+"quiera como se describe a continuación."
+
+#. (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 ""
+"Para dar un nombre a un evento en lugar de referirse a él por su fecha, "
+"seleccione el evento, pulse en <guiseq><gui>Eventos</gui><gui>Renombrar "
+"evento...</gui></guiseq> e introduzca un nuevo nombre. Otra forma de cambiar "
+"el nombre de un evento es pulsar dos veces en su nombre en la barra lateral; "
+"Escriba un nuevo nombre y luego pulse <key>Intro</key>."
+
+#. (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 ""
+"Aunque las fotos se agrupan inicialmente por eventos según su fecha, puede "
+"mover fotos entre eventos. Para ello, arrastre cualquier foto a la barra "
+"lateral y suéltela en un evento."
+
+#. (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 ""
+"Para combinar eventos, seleccione <guiseq><gui>Eventos</gui></guiseq> de la "
+"barra lateral, luego, mientras presiona <key>Ctrl</key> pulse en los eventos "
+"que quiere combinar en la ventana principal. Finalmente, pulse en "
+"<guiseq><gui>Eventos</gui><gui>Combinar eventos</gui></guiseq>."
+
+#. (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 ""
+"Los eventos se muestran en la estructura de árbol en la barra lateral, "
+"organizados por el año y el mes de la primera foto del evento. Para cambiar "
+"el orden de clasificación del evento, pulse en <guiseq><gui>Vista</"
+"gui><gui>Ordenar eventos</gui></guiseq> y seleccione si quiere el orden "
+"ascendente o descendente."
+
+#. (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
+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 <gui>Eventos</gui> 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 ""
+"De manera predeterminada, Shotwell utiliza la primera foto de cada evento "
+"como su vista de miniatura. Para utilizar una foto distinta, seleccione la "
+"foto y elija <guiseq><gui>Fotos</gui><gui>Definir vista de miniatura de "
+"eventos </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 ""
+"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 ""
+"Shotwell le permite <em>marcar</em> sus fotos. Cuando se marca una foto, "
+"aparece un pequeño icono de una bandera en su esquina superior derecha. "
+"Puede seleccionar el elemento <gui>Marcada</gui> en la barra lateral para "
+"ver todas las fotos que se han marcado."
+
+#. (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 ""
+"Marcar una foto hace que esta sea especial. Puede interpretar esto de la "
+"manera que quiera. Por ejemplo, puede marcar todas las fotos que necesitan "
+"un ajuste visual o todas las fotos que quiere compartir con un amigo."
+
+#. (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 ""
+"Marcar fotos es útil porque también puede trabajar en todas las fotos "
+"marcadas como un conjunto. Por ejemplo, puede seleccionar la vista "
+"<gui>Marcada</gui> y luego subir todas las fotos marcadas a un servicio de "
+"publicación."
+
+#. (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 ""
+"Para marcar o desmarcar una foto, pulse con el botón derecho en la foto y "
+"seleccione <gui>Marcar</gui> o <gui>Desmarcar</gui> desde el menú "
+"contextual. O pulse use los atajos del teclado <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> o <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 ""
+"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 ""
+"Seleccione la foto o las fotos, luego pulse cualquiera de los atajos del "
+"teclado <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> o <key>5</"
+"key> para asignar una puntuación. Pulse <key>9</key> para marcar las fotos "
+"como rechazadas o pulse <key>0</key> para borrar las puntuaciones."
+
+#. (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 ""
+"Normalmente, Shotwell muestra todas las fotos excepto las rechazadas. Puede "
+"establecer un filtro de puntuaciones diferente utilizando el menú "
+"<guiseq><gui>Vista</gui><gui>Filtrar fotos</gui></guiseq>. Por ejemplo, "
+"puede mostrar sólo las fotos con puntuación de 3 estrellas o más, o puede "
+"mostrar todas las fotos, incluidas las marcadas como rechazadas. El icono "
+"Shotwell de la barra de herramientas muestra el filtro de puntuación actual "
+"y también se puede utilizar para configurar el filtro."
+
+#. (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 normalmente muestra la puntuación de cada foto en su esquina "
+"inferior izquierda. Puede desactivar la visualización de las puntuaciones "
+"utilzando el elemento del menú <guiseq><gui>Vista</gui><gui>Valoraciones</"
+"gui></guiseq>."
+
+#. (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 ""
+"Puede aumentar o disminuir la puntuación de una foto utilizando los comandos "
+"<guiseq><gui>Establecer puntuación</gui><gui>Aumentar</gui></guiseq> y "
+"<guiseq><gui>Establecer puntuación</gui><gui>Disminuir</gui></guiseq>, o los "
+"atajos del teclado <key>&lt;</key> y <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 ""
+"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 ""
+"Si quiere quitar las fotos de Shotwell sin tener que moverlas a la papelera, "
+"simplemente seleccione las fotos que va a quitar y elija "
+"<guiseq><gui>Editar</gui><gui>Eliminar de la biblioteca</gui></guiseq>. Los "
+"archivos de fotos se dejarán en su lugar en el disco."
+
+#. (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 ""
+"Hay dos maneras de hacer una búsqueda en Shotwell: con la barra de "
+"herramientas de filtro, y con una búsqueda guardada. La barra de búsqueda le "
+"permite buscar rápidamente la vista actual para ciertos criterios. Las "
+"búsquedas guardadas tienen criterios de búsqueda más complejos y se "
+"mantienen en la barra lateral entre sesiones."
+
+#. (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 ""
+"La casilla <guiseq><gui>Vista</gui><gui>Barra de búsqueda</gui></guiseq> "
+"activa la visualización de la barra de búsqueda. También puede pulsar "
+"<keyseq><key>Ctrl</key><key>F</key></keyseq> o <key>F8</key> para abrir la "
+"barra de búsqueda. Desde esta barra, puede encontrar, mostrar y ocultar "
+"fotos y vídeos basados en su título, etiqueta, valoración u otras opciones."
+
+#. (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 ""
+"Para comenzar la búsqueda, simplemente introduzca una palabra clave de "
+"búsqueda en el cuadro de texto o pulse en <gui>Marcada</gui>, "
+"<gui>Puntuación</gui> o <gui>Tipo</gui>. La búsqueda de texto compara sus "
+"palabras clave con los nombres de las etiquetas, los títulos de fotos o "
+"vídeos y los nombres de los archivos originales de las fotos. Los botones "
+"<gui>Marcada</gui>, <gui>Puntuación</gui> y <gui>Tipo</gui> le permiten "
+"filtrar su colección según las fotos marcadas, su número actual de estrellas "
+"y si los elementos mostrados son imágenes, vídeos o archivos de cámara RAW, "
+"respectivamente."
+
+#. (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 ""
+"Cree una nueva búsqueda guardada con <guiseq><gui>Editar</gui><gui>Nueva "
+"búsqueda guardada...</gui></guiseq> o pulsando <keyseq><key>Ctrl</"
+"key><key>S</key></keyseq>. El cuadro de diálogo le permite introducir un "
+"nombre para la búsqueda y seleccionar si quiere marcar alguno, todos o "
+"ninguno de los criterios de las siguientes filas."
+
+#. (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 ""
+"Cada fila representa un criterio de búsqueda. Pulse el botón <gui>+</gui> "
+"para añadir más filas y el botón <gui>-</gui> para eliminar una fila "
+"específica. El cuadro combinado de la izquierda de cada fila selecciona el "
+"tipo de criterios. Los criterios se deben introducir correctamente antes de "
+"que el botón <gui>Aceptar</gui> esté disponible."
+
+#. (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 ""
+"Cuando pulse <keyseq><key>Ctrl</key><key>T</key></keyseq> o "
+"<guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq> puede "
+"escribir los nombres de una o más etiquetas, separadas por comas. Una vez "
+"que haya creado una etiqueta, puede renombrarla seleccionando esa etiqueta "
+"en la barra lateral y eligiendo <guiseq><gui>Etiquetas</gui><gui>Renombrar "
+"etiqueta \"[nombre]\"...</gui></guiseq> pulsando con el botón derecho y "
+"eligiendo <gui>Renombrar...</gui> o pulsando dos veces en la etiqueta de la "
+"barra lateral. "
+
+#. (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 ""
+"Para cambiar las etiquetas asociadas a una foto en particular, seleccione "
+"esa foto, elija <guiseq><gui>Etiquetas</gui><gui>Modificar etiquetas...</"
+"gui></guiseq> o pulse con el botón derecho en una foto y seleccione "
+"<gui>Modificar etiquetas...</gui> y edite la lista separada por comas. Para "
+"quitar una etiqueta de una o más fotos, primero seleccione esa etiqueta en "
+"la barra lateral, luego seleccione las fotos que quiere quitar y elija "
+"<guiseq><gui>Etiquetas</gui><gui>Quitar etiquetas \"[nombre]\" de fotos</"
+"gui></guiseq> o pulse con el botón derecho en las fotos y seleccione "
+"<gui>Quitar etiquetas \"[nombre]\" de fotos</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 ""
+"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
+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 ""
+"Cuando crea una etiqueta, aparecerá en la barra lateral bajo el elemento "
+"<gui>Etiquetas</gui>, que se oculta si no hay etiquetas. 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 "Tí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 ""
+"La casilla de <guiseq><gui>Vista</gui><gui>Títulos</gui></guiseq> activa la "
+"visualización de títulos debajo de cada foto. De manera predeterminada, el "
+"título de la foto es su nombre de archivo."
+
+#. (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 ""
+"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 "Mié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 ""
+"Tenga en cuenta que Shotwell comprueba todos los archivos de fotos para ver "
+"si hay cambios al inicio, pero sólo los archivos de fotos contenidos en la "
+"carpeta de la biblioteca se supervisan en tiempo real después del inicio. "
+"Esperamos eliminar esta limitación en una nueva versión."
+
+#. (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 ""
+"Si ya no quiere que los archivos que faltan formen parte de su colección "
+"Shotwell (tal vez porque los ha eliminado), vaya a la vista de Fotos "
+"ausentes, seleccione las fotos y, a continuación, pulse en <gui>Eliminar de "
+"la biblioteca</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 ""
+"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 ""
+"Normalmente, Shotwell almacena su base de datos y miniaturas de fotos en la "
+"carpeta <file>~/.shotwell</file>. Esta carpeta no contiene fotos, pero la "
+"base de datos de esta carpeta contiene una lista de todas las fotos de la "
+"biblioteca de Shotwell."
+
+#. (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 ""
+"Shotwell se puede usar con <em>complementos</em>, que son bibliotecas "
+"compartidas complementarias que pueden agregar soporte para nuevos destinos "
+"de publicación o nuevas transiciones de presentación de diapositivas."
+
+#. (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 ""
+"Algunas cámaras tienen la capacidad de almacenar datos directamente del "
+"sensor y en un archivo que contiene información adicional de color; Esto se "
+"conoce comúnmente como «RAW» o «cámara RAW», y Shotwell soporta estos "
+"archivos también."
+
+#. (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 ""
+"Dado que las fotografías RAW normalmente no se pueden mostrar directamente, "
+"sino que deben ser desarrolladas por primera vez (se interpreta y se prepara "
+"su información adicional para mostrarse) la mayoría de las cámaras "
+"incorporarán un JPEG dentro de un archivo en formato RAW, o producirán un "
+"JPEG junto con el archivo RAW en el momento en que se toma la foto. Este "
+"último se refiere a todo este documento como RAW+JPEG. Si importa una "
+"pareja de RAW+JPEG, Shotwell los mantendrá sincronizados y los tratará como "
+"un elemento de su biblioteca."
+
+#. (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 ""
+"Al importar un archivo RAW, puede elegir entre usar el desarrollador JPEG "
+"interno de la cámara o el de Shotwell seleccionando <guiseq><gui>Fotos</"
+"gui><gui>Desarrollador</gui></guiseq> en los menús."
+
+#. (itstool) path: note/p
+#: C/raw.page:33
+msgid ""
+"Changing between developers will cause all edits made to a photograph to be "
+"discarded."
+msgstr ""
+"Cambiar entre desarrolladores hará que todas las ediciones hechas en una "
+"foto se descarten."
+
+#. (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 ""
+"Para publicar o usar una foto RAW en la mayoría de los programas, primero se "
+"debe exportar. Shotwell puede exportar sus fotos RAW en formato JPEG, PNG, "
+"TIFF o BMP y, al publicarlas, exportará internamente una versión JPEG para "
+"y la publicará."
+
+#. (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 ""
+"Shotwell también se puede ejecutar automáticamente cuando una cámara está "
+"conectada a su ordenador. Para comprobar que su sistema está configurado "
+"para ejecutar Shotwell cuando se detecta una cámara, pulse en "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> en cualquier "
+"ventana de Nautilus (explorador) y elija la pestaña <gui>Media</gui>.Verá un "
+"cuadro desplegable titulado <gui>Fotos:</gui> que le permitirá elegir "
+"Shotwell como su aplicación de gestión de fotos."
+
+#. (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 ""
+"También puede configurar su fondo para una presentación de fotos. Para ello, "
+"seleccione las fotos de la presentación y elija <guiseq><gui>Archivo</"
+"gui><gui>Establecer como presentación de diapositivas de escritorio...</"
+"gui></guiseq>. Shotwell le pedirá el tiempo de duración de cada diapositiva, "
+"que puede ser desde cualquier intervalo de tiempo hasta un día. La "
+"presentación de diapositivas de fondo continuará incluso cuando Shotwell no "
+"esté funcionando."
+
+#. (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 ""
+"Alternativamente, seleccione un conjunto de fotos y elija el comando "
+"<guiseq><gui>Archivo</gui><gui>Exportar...</gui></guiseq> o pulse "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq> , para exportar "
+"las fotos y al mismo tiempo ajustar el tamaño y las dimensiones de sus "
+"archivos de fotos. Aparecerá una ventana que le permitirá realizar varias "
+"opciones:"
+
+#. (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 ""
+"La opción de si quiere exportar metadatos como etiquetas o puntuaciones "
+"puede ayudar a preservar su privacidad en caso de que tenga etiquetas o "
+"etiquetas de geolocalización que nadie debería ver."
+
+#. (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
+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
+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, elija <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>, elija 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
+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 ""
+"Solo podrá publicar imágenes con el permiso que concedió a la aplicación "
+"Facebook de Shotwell"
+
+#. (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 ""
+"Al visualizar una foto en pantalla completa, el control deslizante de la "
+"barra de herramientas controla el zoom. Puede desplazarse agarrando y "
+"arrastrando donde quiera en la foto. También puede hacer zoom utilizando la "
+"rueda de desplazamiento o pulsando los siguientes atajos de teclado: "
+"<keyseq><key>Ctrl</key>0</keyseq> para la imagen completa, "
+"<keyseq><key>Ctrl</key>1</keyseq> para el 100% (1 pixel de la foto = 1 pixel "
+"de la pantalla), y <keyseq><key>Ctrl</key>2</keyseq> para el 200% (1 pixel "
+"de la foto = 2x2 pixeles de la pantalla)."
+
+#. (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 ""
+"La ventana flotante de información extendida muestra más información sobre "
+"la foto seleccionada. El comando <guiseq><gui>Vista</gui><gui>Información "
+"extendida</gui></guiseq> o <keyseq><key>Ctrl</key><key>Shift</key><key>X</"
+"key></keyseq> activa la visualización de esta ventana."
+
+#. (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/organize-event.page b/help/es/organize-event.page
index 20ef544..12735d7 100644
--- a/help/es/organize-event.page
+++ b/help/es/organize-event.page
@@ -62,7 +62,7 @@
     <section>
     <title>Cambiar la foto usada para representar cada evento</title>
 
-    <p>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.</p>
+    <p>Si selecciona <gui>Eventos</gui> en la barra lateral, verá una única foto que representa cada evento. Esto se denomina «foto clave».</p>
 
     <p>De manera predeterminada, Shotwell utiliza la primera foto de cada evento como su vista de miniatura. Para utilizar una foto distinta, seleccione la foto y elija <guiseq><gui>Fotos</gui><gui>Definir vista de miniatura de eventos </gui></guiseq>.</p>
     
diff --git a/help/es/organize-flag.page b/help/es/organize-flag.page
index 2385561..72c1a95 100644
--- a/help/es/organize-flag.page
+++ b/help/es/organize-flag.page
@@ -30,21 +30,13 @@
 
     <p>Shotwell le permite <em>marcar</em> sus fotos. Cuando se marca una foto, aparece un pequeño icono de una bandera en su esquina superior derecha. Puede seleccionar el elemento <gui>Marcada</gui> en la barra lateral para ver todas las fotos que se han marcado.</p>
     
-    <p>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.</p>
+    <p>Marcar una foto hace que esta sea especial. Puede interpretar esto de la manera que quiera. Por ejemplo, puede marcar todas las fotos que necesitan un ajuste visual o todas las fotos que quiere compartir con un amigo.</p>
     
-    <p>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.</p>
+    <p>Marcar fotos es útil porque también puede trabajar en todas las fotos marcadas como un conjunto. Por ejemplo, puede seleccionar la vista <gui>Marcada</gui> y luego subir todas las fotos marcadas a un servicio de publicación.</p>
     
     <section>
     <title>Para marcar o desmarcar una foto</title>
-    <p>
-    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.
-    </p>
+    <p>Para marcar o desmarcar una foto, pulse con el botón derecho en la foto y seleccione <gui>Marcar</gui> o <gui>Desmarcar</gui> desde el menú contextual. O pulse use los atajos del teclado <keyseq><key>Ctrl</key><key>G</key></keyseq> o <key>/</key>.</p>
     </section>
     
 </page>
diff --git a/help/es/organize-rating.page b/help/es/organize-rating.page
index 19fee4d..41a0797 100644
--- a/help/es/organize-rating.page
+++ b/help/es/organize-rating.page
@@ -34,13 +34,12 @@
 <list>
 <item><p>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.</p></item>
 <item><p>Pulse con el botón derecho en las fotos y luego escoja su puntuación en el menú contextual «Establecer puntuación».</p></item>
-<item><p>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).</p></item>
+<item><p>Seleccione la foto o las fotos, luego pulse cualquiera de los atajos del teclado <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> o <key>5</key> para asignar una puntuación. Pulse <key>9</key> para marcar las fotos como rechazadas o pulse <key>0</key> para borrar las puntuaciones.</p></item>
 </list>
 
-<p>
-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.</p>
+<p>Normalmente, Shotwell muestra todas las fotos excepto las rechazadas. Puede establecer un filtro de puntuaciones diferente utilizando el menú <guiseq><gui>Vista</gui><gui>Filtrar fotos</gui></guiseq>. Por ejemplo, puede mostrar sólo las fotos con puntuación de 3 estrellas o más, o puede mostrar todas las fotos, incluidas las marcadas como rechazadas. El icono Shotwell de la barra de herramientas muestra el filtro de puntuación actual y también se puede utilizar para configurar el filtro.</p>
 
-<p>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.</p>
+<p>Shotwell normalmente muestra la puntuación de cada foto en su esquina inferior izquierda. Puede desactivar la visualización de las puntuaciones utilzando el elemento del menú <guiseq><gui>Vista</gui><gui>Valoraciones</gui></guiseq>.</p>
 
-<p>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>. </p>
+<p>Puede aumentar o disminuir la puntuación de una foto utilizando los comandos <guiseq><gui>Establecer puntuación</gui><gui>Aumentar</gui></guiseq> y <guiseq><gui>Establecer puntuación</gui><gui>Disminuir</gui></guiseq>, o los atajos del teclado <key>&lt;</key> y <key>&gt;</key>.</p>
 </page>
diff --git a/help/es/organize-remove.page b/help/es/organize-remove.page
index f8d1ff2..9bdb302 100644
--- a/help/es/organize-remove.page
+++ b/help/es/organize-remove.page
@@ -34,7 +34,7 @@
 <section id="delete-remove">
 	<title>Quitar fotos de la biblioteca</title>
     <p>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.</p>
-    <p>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.</p>
+    <p>Si quiere quitar las fotos de Shotwell sin tener que moverlas a la papelera, simplemente seleccione las fotos que va a quitar y elija <guiseq><gui>Editar</gui><gui>Eliminar de la biblioteca</gui></guiseq>. Los archivos de fotos se dejarán en su lugar en el disco.</p>
 </section>
 
 <section id="delete-empty">
diff --git a/help/es/organize-search.page b/help/es/organize-search.page
index 73ecfca..013bfa7 100644
--- a/help/es/organize-search.page
+++ b/help/es/organize-search.page
@@ -28,29 +28,13 @@
 
     <title>Búsqueda</title>
     
-    <p>
-        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.
-    </p>
+    <p>Hay dos maneras de hacer una búsqueda en Shotwell: con la barra de herramientas de filtro, y con una búsqueda guardada. La barra de búsqueda le permite buscar rápidamente la vista actual para ciertos criterios. Las búsquedas guardadas tienen criterios de búsqueda más complejos y se mantienen en la barra lateral entre sesiones.</p>
     
     <section id="searchbar">
         <title>Barra de búsqueda</title>
-            <p>
-                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.
-            </p>
+            <p>La casilla <guiseq><gui>Vista</gui><gui>Barra de búsqueda</gui></guiseq> activa la visualización de la barra de búsqueda. También puede pulsar <keyseq><key>Ctrl</key><key>F</key></keyseq> o <key>F8</key> para abrir la barra de búsqueda. Desde esta barra, puede encontrar, mostrar y ocultar fotos y vídeos basados en su título, etiqueta, valoración u otras opciones.</p>
             
-            <p>
-                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. 
-            </p>
+            <p>Para comenzar la búsqueda, simplemente introduzca una palabra clave de búsqueda en el cuadro de texto o pulse en <gui>Marcada</gui>, <gui>Puntuación</gui> o <gui>Tipo</gui>. La búsqueda de texto compara sus palabras clave con los nombres de las etiquetas, los títulos de fotos o vídeos y los nombres de los archivos originales de las fotos. Los botones <gui>Marcada</gui>, <gui>Puntuación</gui> y <gui>Tipo</gui> le permiten filtrar su colección según las fotos marcadas, su número actual de estrellas y si los elementos mostrados son imágenes, vídeos o archivos de cámara RAW, respectivamente.</p>
             
             <p>Desactivar la barra de búsqueda o salir de Shotwell reinicia automáticamente la barra de búsqueda.</p>
     </section>
@@ -59,17 +43,9 @@
         <title>Búsqueda guardada</title>
             <p>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.</p>
             
-            <p>
-                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.
-            </p>
+            <p>Cree una nueva búsqueda guardada con <guiseq><gui>Editar</gui><gui>Nueva búsqueda guardada...</gui></guiseq> o pulsando <keyseq><key>Ctrl</key><key>S</key></keyseq>. El cuadro de diálogo le permite introducir un nombre para la búsqueda y seleccionar si quiere marcar alguno, todos o ninguno de los criterios de las siguientes filas.</p>
             
-            <p>
-                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.
-            </p>
+            <p>Cada fila representa un criterio de búsqueda. Pulse el botón <gui>+</gui> para añadir más filas y el botón <gui>-</gui> para eliminar una fila específica. El cuadro combinado de la izquierda de cada fila selecciona el tipo de criterios. Los criterios se deben introducir correctamente antes de que el botón <gui>Aceptar</gui> esté disponible.</p>
     </section>
 
 </page>
diff --git a/help/es/organize-tag.page b/help/es/organize-tag.page
index 2a10d24..686a6c2 100644
--- a/help/es/organize-tag.page
+++ b/help/es/organize-tag.page
@@ -40,40 +40,13 @@
 		<item><p>Arrastre las fotos y suéltelas en la etiqueta que quiera.</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>Cuando pulse <keyseq><key>Ctrl</key><key>T</key></keyseq> o <guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq> puede escribir los nombres de una o más etiquetas, separadas por comas. Una vez que haya creado una etiqueta, puede renombrarla seleccionando esa etiqueta en la barra lateral y eligiendo <guiseq><gui>Etiquetas</gui><gui>Renombrar etiqueta "[nombre]"...</gui></guiseq> pulsando con el botón derecho y eligiendo <gui>Renombrar...</gui> o pulsando dos veces en la etiqueta de la barra lateral. </p>
     
-    <p>
-		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>.
-	</p>
+    <p>Para cambiar las etiquetas asociadas a una foto en particular, seleccione esa foto, elija <guiseq><gui>Etiquetas</gui><gui>Modificar etiquetas...</gui></guiseq> o pulse con el botón derecho en una foto y seleccione <gui>Modificar etiquetas...</gui> y edite la lista separada por comas. Para quitar una etiqueta de una o más fotos, primero seleccione esa etiqueta en la barra lateral, luego seleccione las fotos que quiere quitar y elija <guiseq><gui>Etiquetas</gui><gui>Quitar etiquetas "[nombre]" de fotos</gui></guiseq> o pulse con el botón derecho en las fotos y seleccione <gui>Quitar etiquetas "[nombre]" de fotos</gui>.</p>
     
     <p>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>.</p>
 
-    <p>
-		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.
-	</p>
+    <p>Cuando crea una etiqueta, aparecerá en la barra lateral bajo el elemento <gui>Etiquetas</gui>, que se oculta si no hay etiquetas. 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.</p>
     
     <section id="hierarchaicaltags">
         <title>Etiquetas jerárquicas</title>
diff --git a/help/es/organize-title.page b/help/es/organize-title.page
index ede92ca..ae1e2b9 100644
--- a/help/es/organize-title.page
+++ b/help/es/organize-title.page
@@ -28,10 +28,8 @@
 
 	<title>Títulos</title>
 
-<p>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.</p>
+<p>La casilla de <guiseq><gui>Vista</gui><gui>Títulos</gui></guiseq> activa la visualización de títulos debajo de cada foto. De manera predeterminada, el título de la foto es su nombre de archivo.</p>
 
-<p>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>.</p>
+<p>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>.</p>
 
 </page>
diff --git a/help/es/other-files.page b/help/es/other-files.page
index d13599e..19b4008 100644
--- a/help/es/other-files.page
+++ b/help/es/other-files.page
@@ -111,9 +111,7 @@
     
     <p>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.</p>
     
-    <p>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.</p>
+    <p>Tenga en cuenta que Shotwell comprueba todos los archivos de fotos para ver si hay cambios al inicio, pero sólo los archivos de fotos contenidos en la carpeta de la biblioteca se supervisan en tiempo real después del inicio. Esperamos eliminar esta limitación en una nueva versión.</p>
 
     </section>
     
diff --git a/help/es/other-missing.page b/help/es/other-missing.page
index fb163c0..511938d 100644
--- a/help/es/other-missing.page
+++ b/help/es/other-missing.page
@@ -30,7 +30,7 @@
 
 <p>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.</p>
 
-<p>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>.</p>
+<p>Si ya no quiere que los archivos que faltan formen parte de su colección Shotwell (tal vez porque los ha eliminado), vaya a la vista de Fotos ausentes, seleccione las fotos y, a continuación, pulse en <gui>Eliminar de la biblioteca</gui>.</p>
 
 <p>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.</p>
 
diff --git a/help/es/other-multiple.page b/help/es/other-multiple.page
index cdca09b..de127bd 100644
--- a/help/es/other-multiple.page
+++ b/help/es/other-multiple.page
@@ -28,7 +28,7 @@
 
 	<title>Varias bibliotecas</title>
 
-<p>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.</p>
+<p>Normalmente, Shotwell almacena su base de datos y miniaturas de fotos en la carpeta <file>~/.shotwell</file>. Esta carpeta no contiene fotos, pero la base de datos de esta carpeta contiene una lista de todas las fotos de la biblioteca de Shotwell.</p>
 
 <p>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:</p>
 
diff --git a/help/es/other-plugins.page b/help/es/other-plugins.page
index ce29547..b735060 100644
--- a/help/es/other-plugins.page
+++ b/help/es/other-plugins.page
@@ -27,10 +27,7 @@
   </info>
 
 	<title>Complementos</title>
-        <p>
-            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.
-        </p>
+        <p>Shotwell se puede usar con <em>complementos</em>, que son bibliotecas compartidas complementarias que pueden agregar soporte para nuevos destinos de publicación o nuevas transiciones de presentación de diapositivas.</p>
         
         <p>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.</p>
         
diff --git a/help/es/raw.page b/help/es/raw.page
index 4de6678..d8604af 100644
--- a/help/es/raw.page
+++ b/help/es/raw.page
@@ -27,37 +27,16 @@
   </info>
    
     <title>Soporte de RAW en Shotwell</title> 
-    <p>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.</p>
+    <p>Algunas cámaras tienen la capacidad de almacenar datos directamente del sensor y en un archivo que contiene información adicional de color; Esto se conoce comúnmente como «RAW» o «cámara RAW», y Shotwell soporta estos archivos también.</p>
     
-    <p>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.
-    </p>
+    <p>Dado que las fotografías RAW normalmente no se pueden mostrar directamente, sino que deben ser desarrolladas por primera vez (se interpreta y se prepara su información adicional para mostrarse) la mayoría de las cámaras incorporarán un JPEG dentro de un archivo en formato RAW, o producirán un JPEG junto con el archivo RAW en el momento en que se toma la foto. Este último se refiere a todo este documento como RAW+JPEG. Si importa una pareja de RAW+JPEG, Shotwell los mantendrá sincronizados y los tratará como un elemento de su biblioteca.</p>
     
-    <p>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.
-    </p>
+    <p>Al importar un archivo RAW, puede elegir entre usar el desarrollador JPEG interno de la cámara o el de Shotwell seleccionando <guiseq><gui>Fotos</gui><gui>Desarrollador</gui></guiseq> en los menús.</p>
 
     <note>
-        <p>
-        Changing between developers will cause all edits made to a photograph
-        to be discarded.
-        </p>
+        <p>Cambiar entre desarrolladores hará que todas las ediciones hechas en una foto se descarten.</p>
     </note>
     
-    <p>
-    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.  
-    </p>  
+    <p>Para publicar o usar una foto RAW en la mayoría de los programas, primero se debe exportar. Shotwell puede exportar sus fotos RAW en formato JPEG, PNG, TIFF o BMP y, al publicarlas, exportará internamente una versión JPEG para y la publicará.</p>  
     
 </page>
diff --git a/help/es/running.page b/help/es/running.page
index 61bc890..5a33ac4 100644
--- a/help/es/running.page
+++ b/help/es/running.page
@@ -32,11 +32,7 @@
 
 <p>Una vez instalado, Shotwell estará disponible en su menú <gui>Aplicaciones</gui>, en <gui>Gráficos</gui> o en <gui>Fotografía</gui>.</p>
 
-<p>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.</p>
+<p>Shotwell también se puede ejecutar automáticamente cuando una cámara está conectada a su ordenador. Para comprobar que su sistema está configurado para ejecutar Shotwell cuando se detecta una cámara, pulse en <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> en cualquier ventana de Nautilus (explorador) y elija la pestaña <gui>Media</gui>.Verá un cuadro desplegable titulado <gui>Fotos:</gui> que le permitirá elegir Shotwell como su aplicación de gestión de fotos.</p>
 
 <note style="advanced">
  <p>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.</p>
diff --git a/help/es/share-background.page b/help/es/share-background.page
index 84bacd4..b0b852e 100644
--- a/help/es/share-background.page
+++ b/help/es/share-background.page
@@ -30,10 +30,6 @@
 
     <p>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>.</p>
     
-    <p>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.
-    </p>
+    <p>También puede configurar su fondo para una presentación de fotos. Para ello, seleccione las fotos de la presentación y elija <guiseq><gui>Archivo</gui><gui>Establecer como presentación de diapositivas de escritorio...</gui></guiseq>. Shotwell le pedirá el tiempo de duración de cada diapositiva, que puede ser desde cualquier intervalo de tiempo hasta un día. La presentación de diapositivas de fondo continuará incluso cuando Shotwell no esté funcionando.</p>
     
 </page>
diff --git a/help/es/share-export.page b/help/es/share-export.page
index da280ca..2e1db2f 100644
--- a/help/es/share-export.page
+++ b/help/es/share-export.page
@@ -30,10 +30,7 @@
 
 <p>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.</p>
 
-<p>
-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:
-</p>
+<p>Alternativamente, seleccione un conjunto de fotos y elija el comando <guiseq><gui>Archivo</gui><gui>Exportar...</gui></guiseq> o pulse <keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq> , para exportar las fotos y al mismo tiempo ajustar el tamaño y las dimensiones de sus archivos de fotos. Aparecerá una ventana que le permitirá realizar varias opciones:</p>
 
 <list>
 <item><p>Un formato al que exportar.</p>
@@ -45,7 +42,7 @@ A window will appear allowing you to make several choices:
 </item>
 <item><p>La calidad de la imagen al exportarla (baja, media, alta o máxima).</p></item>
 <item><p>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.</p></item>
-<item><p>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.</p></item>
+<item><p>La opción de si quiere exportar metadatos como etiquetas o puntuaciones puede ayudar a preservar su privacidad en caso de que tenga etiquetas o etiquetas de geolocalización que nadie debería ver.</p></item>
 </list>
 
 <p>Si está seleccionada, Shotwell escribirá etiquetas, títulos y otros metadatos a los nuevos archivos.</p>
diff --git a/help/es/share-print.page b/help/es/share-print.page
index cb1fcf3..5d583fa 100644
--- a/help/es/share-print.page
+++ b/help/es/share-print.page
@@ -28,14 +28,9 @@
 
 	<title>Imprimir</title>
 
-    <p>To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>.</p>
+    <p>Para imprimir una foto, selecciónela y elija <guiseq><gui>Archivo</gui><gui>Imprimir</gui></guiseq>.</p>
      
-    <p>
-    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>.
-    </p>
+    <p>Shotwell puede también imprimir varias imágenes en una página; para hacer esto, seleccione las imágenes, elija <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>, elija una de las opciones múltiples imágenes por página en <gui>Tamaño automático</gui>.</p>
 
     <p>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.</p>
 </page>
diff --git a/help/es/share-upload.page b/help/es/share-upload.page
index 076336f..fe393f7 100644
--- a/help/es/share-upload.page
+++ b/help/es/share-upload.page
@@ -41,10 +41,8 @@
     
     <p>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.</p>
     
-    <p>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.
-</p>
-    <note style="advanced"><p>You will be only able to publish images with at most the permission you granted to the Shotwell Facebook application</p></note>
+    <p>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.</p>
+    <note style="advanced"><p>Solo podrá publicar imágenes con el permiso que concedió a la aplicación Facebook de Shotwell</p></note>
     
     <p>Del mismo modo, publicar en Flickr requiere que inicie sesión y permita que Shotwell Connect acceda a su cuenta.</p>
     
diff --git a/help/es/view-displaying.page b/help/es/view-displaying.page
index 02d457b..2a4bfbc 100644
--- a/help/es/view-displaying.page
+++ b/help/es/view-displaying.page
@@ -32,7 +32,7 @@
 
 <p>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>.</p>
 
-<p>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).</p>
+<p>Al visualizar una foto en pantalla completa, el control deslizante de la barra de herramientas controla el zoom. Puede desplazarse agarrando y arrastrando donde quiera en la foto. También puede hacer zoom utilizando la rueda de desplazamiento o pulsando los siguientes atajos de teclado: <keyseq><key>Ctrl</key>0</keyseq> para la imagen completa, <keyseq><key>Ctrl</key>1</keyseq> para el 100% (1 pixel de la foto = 1 pixel de la pantalla), y <keyseq><key>Ctrl</key>2</keyseq> para el 200% (1 pixel de la foto = 2x2 pixeles de la pantalla).</p>
 
 <p>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.</p>
 
diff --git a/help/es/view-information.page b/help/es/view-information.page
index 4bae654..a8ce41d 100644
--- a/help/es/view-information.page
+++ b/help/es/view-information.page
@@ -30,6 +30,6 @@
 
 <p>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>.</p>
 
-<p>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.</p>
+<p>La ventana flotante de información extendida muestra más información sobre la foto seleccionada. El comando <guiseq><gui>Vista</gui><gui>Información extendida</gui></guiseq> o <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></keyseq> activa la visualización de esta ventana.</p>
 
 </page>
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 11489d9..3716038 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -6,7 +6,6 @@
       <file alias="tag_sidebar_context.ui">ui/tag_sidebar_context.ui</file>
       <file alias="sidebar_default_context.ui">ui/sidebar_default_context.ui</file>
       <file alias="search_bar.ui">ui/search_bar.ui</file>
-      <file alias="appmenu.ui">ui/appmenu.ui</file>
       <file>ui/set_background_dialog.ui</file>
       <file>ui/set_background_slideshow_dialog.ui</file>
   </gresource>
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 10cb0ca..3e6201b 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.32.1, the Vala compiler
+/* BuilderPane.c generated by valac 0.34.4, the Vala compiler
  * generated from BuilderPane.vala, do not modify */
 
 /* Copyright 2016 Jens Georg <mail@jensge.org>
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index a603147..b3397f2 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -1,4 +1,4 @@
-/* RESTSupport.c generated by valac 0.32.1, the Vala compiler
+/* RESTSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from RESTSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -578,7 +578,6 @@ 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);
@@ -612,7 +611,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_dup3 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup2 (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);
@@ -750,41 +749,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 781 "RESTSupport.c"
+#line 780 "RESTSupport.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 787 "RESTSupport.c"
+#line 786 "RESTSupport.c"
 }
 
 
@@ -846,7 +845,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 849 "RESTSupport.c"
+#line 848 "RESTSupport.c"
 }
 
 
@@ -878,7 +877,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 881 "RESTSupport.c"
+#line 880 "RESTSupport.c"
 }
 
 
@@ -892,7 +891,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 895 "RESTSupport.c"
+#line 894 "RESTSupport.c"
 }
 
 
@@ -901,7 +900,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 904 "RESTSupport.c"
+#line 903 "RESTSupport.c"
 }
 
 
@@ -913,7 +912,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 916 "RESTSupport.c"
+#line 915 "RESTSupport.c"
 }
 
 
@@ -922,7 +921,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 925 "RESTSupport.c"
+#line 924 "RESTSupport.c"
 }
 
 
@@ -931,7 +930,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 934 "RESTSupport.c"
+#line 933 "RESTSupport.c"
 }
 
 
@@ -949,7 +948,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 952 "RESTSupport.c"
+#line 951 "RESTSupport.c"
 }
 
 
@@ -963,7 +962,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 966 "RESTSupport.c"
+#line 965 "RESTSupport.c"
 }
 
 
@@ -978,14 +977,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 981 "RESTSupport.c"
+#line 980 "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 988 "RESTSupport.c"
+#line 987 "RESTSupport.c"
 }
 
 
@@ -1006,7 +1005,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1009 "RESTSupport.c"
+#line 1008 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -1024,7 +1023,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 1027 "RESTSupport.c"
+#line 1026 "RESTSupport.c"
 }
 
 
@@ -1041,14 +1040,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 1044 "RESTSupport.c"
+#line 1043 "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 1051 "RESTSupport.c"
+#line 1050 "RESTSupport.c"
 }
 
 
@@ -1057,7 +1056,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 1060 "RESTSupport.c"
+#line 1059 "RESTSupport.c"
 	}
 }
 
@@ -1067,11 +1066,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 1070 "RESTSupport.c"
+#line 1069 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1074 "RESTSupport.c"
+#line 1073 "RESTSupport.c"
 	}
 }
 
@@ -1079,37 +1078,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 1082 "RESTSupport.c"
+#line 1081 "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 1089 "RESTSupport.c"
+#line 1088 "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 1096 "RESTSupport.c"
+#line 1095 "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 1100 "RESTSupport.c"
+#line 1099 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1104 "RESTSupport.c"
+#line 1103 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1108 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1112 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
 }
 
 
@@ -1120,25 +1119,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 1123 "RESTSupport.c"
+#line 1122 "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 1129 "RESTSupport.c"
+#line 1128 "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 1133 "RESTSupport.c"
+#line 1132 "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 1137 "RESTSupport.c"
+#line 1136 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1141 "RESTSupport.c"
+#line 1140 "RESTSupport.c"
 }
 
 
@@ -1152,7 +1151,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 1155 "RESTSupport.c"
+#line 1154 "RESTSupport.c"
 }
 
 
@@ -1161,7 +1160,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 1164 "RESTSupport.c"
+#line 1163 "RESTSupport.c"
 }
 
 
@@ -1181,17 +1180,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 1184 "RESTSupport.c"
+#line 1183 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1188 "RESTSupport.c"
+#line 1187 "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 1194 "RESTSupport.c"
+#line 1193 "RESTSupport.c"
 	}
 }
 
@@ -1210,17 +1209,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 1213 "RESTSupport.c"
+#line 1212 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1217 "RESTSupport.c"
+#line 1216 "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 1223 "RESTSupport.c"
+#line 1222 "RESTSupport.c"
 	}
 }
 
@@ -1240,7 +1239,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 1243 "RESTSupport.c"
+#line 1242 "RESTSupport.c"
 }
 
 
@@ -1255,7 +1254,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 1258 "RESTSupport.c"
+#line 1257 "RESTSupport.c"
 }
 
 
@@ -1269,7 +1268,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 1272 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
 }
 
 
@@ -1294,7 +1293,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 1297 "RESTSupport.c"
+#line 1296 "RESTSupport.c"
 }
 
 
@@ -1307,7 +1306,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 1310 "RESTSupport.c"
+#line 1309 "RESTSupport.c"
 	}
 }
 
@@ -1318,7 +1317,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 1321 "RESTSupport.c"
+#line 1320 "RESTSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1327,11 +1326,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 1330 "RESTSupport.c"
+#line 1329 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1334 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1340,11 +1339,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 1343 "RESTSupport.c"
+#line 1342 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1347 "RESTSupport.c"
+#line 1346 "RESTSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1353,13 +1352,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 1356 "RESTSupport.c"
+#line 1355 "RESTSupport.c"
 		}
 		default:
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1362 "RESTSupport.c"
+#line 1361 "RESTSupport.c"
 		}
 	}
 }
@@ -1378,7 +1377,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 1381 "RESTSupport.c"
+#line 1380 "RESTSupport.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1389,7 +1388,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 1392 "RESTSupport.c"
+#line 1391 "RESTSupport.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1400,14 +1399,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 1403 "RESTSupport.c"
+#line 1402 "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 1410 "RESTSupport.c"
+#line 1409 "RESTSupport.c"
 			}
 		}
 	}
@@ -1456,14 +1455,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	self->value = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1459 "RESTSupport.c"
+#line 1458 "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 1466 "RESTSupport.c"
+#line 1465 "RESTSupport.c"
 }
 
 
@@ -1495,7 +1494,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	result = _tmp5_;
 #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1498 "RESTSupport.c"
+#line 1497 "RESTSupport.c"
 }
 
 
@@ -1504,14 +1503,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 1507 "RESTSupport.c"
+#line 1506 "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 1514 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
 }
 
 
@@ -1534,7 +1533,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 1537 "RESTSupport.c"
+#line 1536 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -1546,14 +1545,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 1549 "RESTSupport.c"
+#line 1548 "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 1556 "RESTSupport.c"
+#line 1555 "RESTSupport.c"
 			{
 				GeeTreeSet* _tmp3_ = NULL;
 				PublishingRESTSupportArgument* _tmp4_ = NULL;
@@ -1565,7 +1564,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 1568 "RESTSupport.c"
+#line 1567 "RESTSupport.c"
 			}
 		}
 	}
@@ -1581,7 +1580,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 1584 "RESTSupport.c"
+#line 1583 "RESTSupport.c"
 	}
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
@@ -1589,7 +1588,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 1592 "RESTSupport.c"
+#line 1591 "RESTSupport.c"
 }
 
 
@@ -1610,14 +1609,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
 	result = _tmp2_;
 #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1613 "RESTSupport.c"
+#line 1612 "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 1620 "RESTSupport.c"
+#line 1619 "RESTSupport.c"
 }
 
 
@@ -1626,7 +1625,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 1629 "RESTSupport.c"
+#line 1628 "RESTSupport.c"
 	}
 }
 
@@ -1636,11 +1635,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 1639 "RESTSupport.c"
+#line 1638 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1643 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
 	}
 }
 
@@ -1648,37 +1647,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 1651 "RESTSupport.c"
+#line 1650 "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 1658 "RESTSupport.c"
+#line 1657 "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 1665 "RESTSupport.c"
+#line 1664 "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 1669 "RESTSupport.c"
+#line 1668 "RESTSupport.c"
 		}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1673 "RESTSupport.c"
+#line 1672 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1677 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1681 "RESTSupport.c"
+#line 1680 "RESTSupport.c"
 }
 
 
@@ -1689,25 +1688,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 1692 "RESTSupport.c"
+#line 1691 "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 1698 "RESTSupport.c"
+#line 1697 "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 1702 "RESTSupport.c"
+#line 1701 "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 1706 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1710 "RESTSupport.c"
+#line 1709 "RESTSupport.c"
 }
 
 
@@ -1721,7 +1720,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 1724 "RESTSupport.c"
+#line 1723 "RESTSupport.c"
 }
 
 
@@ -1730,7 +1729,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 1733 "RESTSupport.c"
+#line 1732 "RESTSupport.c"
 }
 
 
@@ -1750,17 +1749,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 1753 "RESTSupport.c"
+#line 1752 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1757 "RESTSupport.c"
+#line 1756 "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 1763 "RESTSupport.c"
+#line 1762 "RESTSupport.c"
 	}
 }
 
@@ -1779,17 +1778,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 1782 "RESTSupport.c"
+#line 1781 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1786 "RESTSupport.c"
+#line 1785 "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 1792 "RESTSupport.c"
+#line 1791 "RESTSupport.c"
 	}
 }
 
@@ -1799,14 +1798,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 1802 "RESTSupport.c"
+#line 1801 "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 1809 "RESTSupport.c"
+#line 1808 "RESTSupport.c"
 }
 
 
@@ -1820,7 +1819,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 1823 "RESTSupport.c"
+#line 1822 "RESTSupport.c"
 }
 
 
@@ -1845,7 +1844,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 1848 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
 }
 
 
@@ -1858,7 +1857,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 1861 "RESTSupport.c"
+#line 1860 "RESTSupport.c"
 	}
 }
 
@@ -1866,7 +1865,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 1869 "RESTSupport.c"
+#line 1868 "RESTSupport.c"
 }
 
 
@@ -1930,14 +1929,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 1933 "RESTSupport.c"
+#line 1932 "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 1940 "RESTSupport.c"
+#line 1939 "RESTSupport.c"
 }
 
 
@@ -1987,14 +1986,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	_g_free0 (_tmp5_);
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1990 "RESTSupport.c"
+#line 1989 "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 1997 "RESTSupport.c"
+#line 1996 "RESTSupport.c"
 }
 
 
@@ -2028,14 +2027,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 2031 "RESTSupport.c"
+#line 2030 "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 2038 "RESTSupport.c"
+#line 2037 "RESTSupport.c"
 }
 
 
@@ -2055,7 +2054,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 2058 "RESTSupport.c"
+#line 2057 "RESTSupport.c"
 	}
 	{
 		SoupMessage* _tmp2_ = NULL;
@@ -2067,7 +2066,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 2070 "RESTSupport.c"
+#line 2069 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2076,7 +2075,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 2079 "RESTSupport.c"
+#line 2078 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
@@ -2117,7 +2116,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 2120 "RESTSupport.c"
+#line 2119 "RESTSupport.c"
 	}
 	__finally0:
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2128,7 +2127,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 2131 "RESTSupport.c"
+#line 2130 "RESTSupport.c"
 	}
 }
 
@@ -2136,7 +2135,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 2139 "RESTSupport.c"
+#line 2138 "RESTSupport.c"
 }
 
 
@@ -2187,7 +2186,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 2190 "RESTSupport.c"
+#line 2189 "RESTSupport.c"
 		GeeArrayList* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2197,13 +2196,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 2199 "RESTSupport.c"
+#line 2198 "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 2205 "RESTSupport.c"
+#line 2204 "RESTSupport.c"
 		GeeArrayList* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2213,13 +2212,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 2214 "RESTSupport.c"
+#line 2213 "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 2220 "RESTSupport.c"
+#line 2219 "RESTSupport.c"
 		GeeArrayList* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2229,13 +2228,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 2229 "RESTSupport.c"
+#line 2228 "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 2235 "RESTSupport.c"
+#line 2234 "RESTSupport.c"
 		GeeArrayList* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2245,13 +2244,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 2244 "RESTSupport.c"
+#line 2243 "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 2250 "RESTSupport.c"
+#line 2249 "RESTSupport.c"
 		GeeArrayList* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2261,13 +2260,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 2259 "RESTSupport.c"
+#line 2258 "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 2265 "RESTSupport.c"
+#line 2264 "RESTSupport.c"
 		GeeArrayList* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2277,13 +2276,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 2274 "RESTSupport.c"
+#line 2273 "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 2280 "RESTSupport.c"
+#line 2279 "RESTSupport.c"
 		GeeArrayList* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2293,7 +2292,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 2289 "RESTSupport.c"
+#line 2288 "RESTSupport.c"
 	}
 #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = g_string_new ("");
@@ -2307,7 +2306,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 2303 "RESTSupport.c"
+#line 2302 "RESTSupport.c"
 		GString* _tmp30_ = NULL;
 		GeeArrayList* _tmp31_ = NULL;
 		gpointer _tmp32_ = NULL;
@@ -2324,7 +2323,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 2320 "RESTSupport.c"
+#line 2319 "RESTSupport.c"
 	} else {
 		{
 			GeeArrayList* _entry_list = NULL;
@@ -2353,7 +2352,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 2349 "RESTSupport.c"
+#line 2348 "RESTSupport.c"
 				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
 				gint _tmp41_ = 0;
@@ -2375,7 +2374,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 2371 "RESTSupport.c"
+#line 2370 "RESTSupport.c"
 				}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp42_ = _entry_list;
@@ -2393,11 +2392,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 2389 "RESTSupport.c"
+#line 2388 "RESTSupport.c"
 			}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (_entry_list);
-#line 2393 "RESTSupport.c"
+#line 2392 "RESTSupport.c"
 		}
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2416,15 +2415,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 2412 "RESTSupport.c"
+#line 2411 "RESTSupport.c"
 	} else {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_vala_cert);
-#line 2416 "RESTSupport.c"
+#line 2415 "RESTSupport.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2420 "RESTSupport.c"
+#line 2419 "RESTSupport.c"
 }
 
 
@@ -2454,17 +2453,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 2450 "RESTSupport.c"
+#line 2449 "RESTSupport.c"
 		{
 #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2454 "RESTSupport.c"
+#line 2453 "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 2460 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
 		{
 			gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
@@ -2497,7 +2496,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 2493 "RESTSupport.c"
+#line 2492 "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);
@@ -2505,14 +2504,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 2501 "RESTSupport.c"
+#line 2500 "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 2508 "RESTSupport.c"
+#line 2507 "RESTSupport.c"
 		{
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -2545,7 +2544,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 2541 "RESTSupport.c"
+#line 2540 "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);
@@ -2553,12 +2552,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 2549 "RESTSupport.c"
+#line 2548 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2554 "RESTSupport.c"
+#line 2553 "RESTSupport.c"
 		{
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -2582,7 +2581,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 2578 "RESTSupport.c"
+#line 2577 "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);
@@ -2590,7 +2589,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 2586 "RESTSupport.c"
+#line 2585 "RESTSupport.c"
 			}
 		}
 		default:
@@ -2606,7 +2605,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 2602 "RESTSupport.c"
+#line 2601 "RESTSupport.c"
 				gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
 				SoupMessage* _tmp26_ = NULL;
@@ -2652,7 +2651,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 2648 "RESTSupport.c"
+#line 2647 "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);
@@ -2660,7 +2659,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 2656 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
 				}
 			} else {
 				gchar* _tmp35_ = NULL;
@@ -2694,7 +2693,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 2690 "RESTSupport.c"
+#line 2689 "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);
@@ -2702,7 +2701,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 2698 "RESTSupport.c"
+#line 2697 "RESTSupport.c"
 				}
 			}
 		}
@@ -2719,7 +2718,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 2715 "RESTSupport.c"
+#line 2714 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp46_ = NULL;
 		SoupMessageBody* _tmp47_ = NULL;
@@ -2735,11 +2734,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 2731 "RESTSupport.c"
+#line 2730 "RESTSupport.c"
 	}
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2735 "RESTSupport.c"
+#line 2734 "RESTSupport.c"
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		GError* _tmp51_ = NULL;
@@ -2762,7 +2761,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 2758 "RESTSupport.c"
+#line 2757 "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);
@@ -2770,7 +2769,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 2766 "RESTSupport.c"
+#line 2765 "RESTSupport.c"
 		}
 	}
 }
@@ -2783,17 +2782,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 2779 "RESTSupport.c"
+#line 2778 "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 2785 "RESTSupport.c"
+#line 2784 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2789 "RESTSupport.c"
+#line 2788 "RESTSupport.c"
 }
 
 
@@ -2823,13 +2822,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 2819 "RESTSupport.c"
+#line 2818 "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 2825 "RESTSupport.c"
+#line 2824 "RESTSupport.c"
 }
 
 
@@ -2869,13 +2868,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 2865 "RESTSupport.c"
+#line 2864 "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 2871 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
 }
 
 
@@ -2887,14 +2886,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 2883 "RESTSupport.c"
+#line 2882 "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 2890 "RESTSupport.c"
+#line 2889 "RESTSupport.c"
 }
 
 
@@ -2942,23 +2941,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 2938 "RESTSupport.c"
+#line 2937 "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 2944 "RESTSupport.c"
+#line 2943 "RESTSupport.c"
 	} else {
 #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "completed");
-#line 2948 "RESTSupport.c"
+#line 2947 "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 2954 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
 		GError* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2973,7 +2972,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 2969 "RESTSupport.c"
+#line 2968 "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);
@@ -2981,7 +2980,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 2977 "RESTSupport.c"
+#line 2976 "RESTSupport.c"
 		}
 	}
 }
@@ -3015,7 +3014,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	result = _tmp5_;
 #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3011 "RESTSupport.c"
+#line 3010 "RESTSupport.c"
 }
 
 
@@ -3038,7 +3037,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 3034 "RESTSupport.c"
+#line 3033 "RESTSupport.c"
 }
 
 
@@ -3047,7 +3046,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 3043 "RESTSupport.c"
+#line 3042 "RESTSupport.c"
 }
 
 
@@ -3081,19 +3080,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 3077 "RESTSupport.c"
+#line 3076 "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 3083 "RESTSupport.c"
+#line 3082 "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 3089 "RESTSupport.c"
+#line 3088 "RESTSupport.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3106,7 +3105,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 3102 "RESTSupport.c"
+#line 3101 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
@@ -3128,7 +3127,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 3124 "RESTSupport.c"
+#line 3123 "RESTSupport.c"
 }
 
 
@@ -3147,7 +3146,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 3143 "RESTSupport.c"
+#line 3142 "RESTSupport.c"
 }
 
 
@@ -3162,7 +3161,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 3158 "RESTSupport.c"
+#line 3157 "RESTSupport.c"
 }
 
 
@@ -3188,14 +3187,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 3184 "RESTSupport.c"
+#line 3183 "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 3191 "RESTSupport.c"
+#line 3190 "RESTSupport.c"
 }
 
 
@@ -3225,7 +3224,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 3221 "RESTSupport.c"
+#line 3220 "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);
@@ -3233,18 +3232,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 3229 "RESTSupport.c"
+#line 3228 "RESTSupport.c"
 			}
 		}
 #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3234 "RESTSupport.c"
+#line 3233 "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 3240 "RESTSupport.c"
+#line 3239 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3253,25 +3252,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 3249 "RESTSupport.c"
+#line 3248 "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 3255 "RESTSupport.c"
+#line 3254 "RESTSupport.c"
 	{
 		gint i = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 3260 "RESTSupport.c"
+#line 3259 "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 3267 "RESTSupport.c"
+#line 3266 "RESTSupport.c"
 				gint _tmp6_ = 0;
 				PublishingRESTSupportArgument** _tmp7_ = NULL;
 				gint _tmp7__length1 = 0;
@@ -3288,13 +3287,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 3284 "RESTSupport.c"
+#line 3283 "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 3290 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
 				}
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -3308,7 +3307,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 3304 "RESTSupport.c"
+#line 3303 "RESTSupport.c"
 				}
 #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
@@ -3340,7 +3339,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 3336 "RESTSupport.c"
+#line 3335 "RESTSupport.c"
 					const gchar* _tmp17_ = NULL;
 					gchar* _tmp18_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3351,7 +3350,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 3347 "RESTSupport.c"
+#line 3346 "RESTSupport.c"
 				}
 			}
 		}
@@ -3364,7 +3363,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 3360 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3373,15 +3372,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 3369 "RESTSupport.c"
+#line 3368 "RESTSupport.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3373 "RESTSupport.c"
+#line 3372 "RESTSupport.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3377 "RESTSupport.c"
+#line 3376 "RESTSupport.c"
 		SoupMessage* _tmp22_ = NULL;
 		SoupURI* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
@@ -3437,7 +3436,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 3433 "RESTSupport.c"
+#line 3432 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp35_ = NULL;
 		const gchar* _tmp36_ = NULL;
@@ -3457,11 +3456,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 3453 "RESTSupport.c"
+#line 3452 "RESTSupport.c"
 	}
 #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3457 "RESTSupport.c"
+#line 3456 "RESTSupport.c"
 	{
 		SoupMessage* _tmp39_ = NULL;
 		SoupURI* _tmp40_ = NULL;
@@ -3483,7 +3482,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 3479 "RESTSupport.c"
+#line 3478 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
@@ -3494,7 +3493,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 3490 "RESTSupport.c"
+#line 3489 "RESTSupport.c"
 			SoupMessage* _tmp44_ = NULL;
 			const gchar* _tmp45_ = NULL;
 			SoupURI* _tmp46_ = NULL;
@@ -3511,7 +3510,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 3507 "RESTSupport.c"
+#line 3506 "RESTSupport.c"
 		}
 	}
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3528,7 +3527,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 3524 "RESTSupport.c"
+#line 3523 "RESTSupport.c"
 		} else {
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
@@ -3542,7 +3541,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 3538 "RESTSupport.c"
+#line 3537 "RESTSupport.c"
 		}
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3551,7 +3550,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 3547 "RESTSupport.c"
+#line 3546 "RESTSupport.c"
 }
 
 
@@ -3560,7 +3559,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 3556 "RESTSupport.c"
+#line 3555 "RESTSupport.c"
 }
 
 
@@ -3592,7 +3591,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	result = _tmp4_;
 #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3588 "RESTSupport.c"
+#line 3587 "RESTSupport.c"
 }
 
 
@@ -3615,7 +3614,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 3611 "RESTSupport.c"
+#line 3610 "RESTSupport.c"
 }
 
 
@@ -3638,7 +3637,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	result = _tmp2_;
 #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3634 "RESTSupport.c"
+#line 3633 "RESTSupport.c"
 }
 
 
@@ -3649,13 +3648,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 3645 "RESTSupport.c"
+#line 3644 "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 3651 "RESTSupport.c"
+#line 3650 "RESTSupport.c"
 }
 
 
@@ -3683,7 +3682,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 3679 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
 }
 
 
@@ -3697,7 +3696,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 3693 "RESTSupport.c"
+#line 3692 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3708,7 +3707,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 3704 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
 	} else {
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3720,20 +3719,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 3716 "RESTSupport.c"
+#line 3715 "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 3722 "RESTSupport.c"
+#line 3721 "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 3729 "RESTSupport.c"
+#line 3728 "RESTSupport.c"
 }
 
 
@@ -3751,7 +3750,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	result = _tmp1_;
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3747 "RESTSupport.c"
+#line 3746 "RESTSupport.c"
 }
 
 
@@ -3770,26 +3769,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 3766 "RESTSupport.c"
+#line 3765 "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 3772 "RESTSupport.c"
+#line 3771 "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 3778 "RESTSupport.c"
+#line 3777 "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 3785 "RESTSupport.c"
+#line 3784 "RESTSupport.c"
 }
 
 
@@ -3798,7 +3797,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 3794 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
 	}
 }
 
@@ -3808,11 +3807,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 3804 "RESTSupport.c"
+#line 3803 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3808 "RESTSupport.c"
+#line 3807 "RESTSupport.c"
 	}
 }
 
@@ -3820,37 +3819,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 3816 "RESTSupport.c"
+#line 3815 "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 3823 "RESTSupport.c"
+#line 3822 "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 3830 "RESTSupport.c"
+#line 3829 "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 3834 "RESTSupport.c"
+#line 3833 "RESTSupport.c"
 		}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3838 "RESTSupport.c"
+#line 3837 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3842 "RESTSupport.c"
+#line 3841 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3846 "RESTSupport.c"
+#line 3845 "RESTSupport.c"
 }
 
 
@@ -3861,25 +3860,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 3857 "RESTSupport.c"
+#line 3856 "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 3863 "RESTSupport.c"
+#line 3862 "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 3867 "RESTSupport.c"
+#line 3866 "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 3871 "RESTSupport.c"
+#line 3870 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3875 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
 }
 
 
@@ -3893,7 +3892,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 3889 "RESTSupport.c"
+#line 3888 "RESTSupport.c"
 }
 
 
@@ -3902,7 +3901,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 3898 "RESTSupport.c"
+#line 3897 "RESTSupport.c"
 }
 
 
@@ -3922,17 +3921,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 3918 "RESTSupport.c"
+#line 3917 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3922 "RESTSupport.c"
+#line 3921 "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 3928 "RESTSupport.c"
+#line 3927 "RESTSupport.c"
 	}
 }
 
@@ -3951,17 +3950,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 3947 "RESTSupport.c"
+#line 3946 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3951 "RESTSupport.c"
+#line 3950 "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 3957 "RESTSupport.c"
+#line 3956 "RESTSupport.c"
 	}
 }
 
@@ -3983,7 +3982,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 3979 "RESTSupport.c"
+#line 3978 "RESTSupport.c"
 }
 
 
@@ -4004,7 +4003,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 4000 "RESTSupport.c"
+#line 3999 "RESTSupport.c"
 }
 
 
@@ -4022,7 +4021,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 4018 "RESTSupport.c"
+#line 4017 "RESTSupport.c"
 }
 
 
@@ -4047,7 +4046,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 4043 "RESTSupport.c"
+#line 4042 "RESTSupport.c"
 }
 
 
@@ -4060,7 +4059,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 4056 "RESTSupport.c"
+#line 4055 "RESTSupport.c"
 	}
 }
 
@@ -4115,14 +4114,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp7_;
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4111 "RESTSupport.c"
+#line 4110 "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 4118 "RESTSupport.c"
+#line 4117 "RESTSupport.c"
 }
 
 
@@ -4181,14 +4180,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp8_;
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4177 "RESTSupport.c"
+#line 4176 "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 4184 "RESTSupport.c"
+#line 4183 "RESTSupport.c"
 }
 
 
@@ -4211,7 +4210,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 4207 "RESTSupport.c"
+#line 4206 "RESTSupport.c"
 }
 
 
@@ -4222,7 +4221,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 4218 "RESTSupport.c"
+#line 4217 "RESTSupport.c"
 		gchar* _tmp1_ = NULL;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
@@ -4230,14 +4229,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 4226 "RESTSupport.c"
+#line 4225 "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 4233 "RESTSupport.c"
+#line 4232 "RESTSupport.c"
 			gchar* _tmp3_ = NULL;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
@@ -4245,7 +4244,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 4241 "RESTSupport.c"
+#line 4240 "RESTSupport.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp4_ = 0;
 			GEnumValue* _tmp5_;
@@ -4255,7 +4254,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 4251 "RESTSupport.c"
+#line 4250 "RESTSupport.c"
 		}
 	}
 }
@@ -4264,7 +4263,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 4260 "RESTSupport.c"
+#line 4259 "RESTSupport.c"
 }
 
 
@@ -4315,14 +4314,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 4311 "RESTSupport.c"
+#line 4310 "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 4318 "RESTSupport.c"
+#line 4317 "RESTSupport.c"
 }
 
 
@@ -4341,28 +4340,21 @@ 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 4337 "RESTSupport.c"
+#line 4336 "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 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"
+#line 4343 "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 4358 "RESTSupport.c"
+#line 4350 "RESTSupport.c"
 }
 
 
@@ -4390,8 +4382,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	gint _tmp23__length1 = 0;
 	guint8* _tmp24_ = NULL;
 	gint _tmp24__length1 = 0;
-	guint8* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
+	gsize _tmp25_ = 0UL;
 	SoupBuffer* _tmp26_ = NULL;
 	SoupMultipart* _tmp27_ = NULL;
 	SpitPublishingPublishable* _tmp28_ = NULL;
@@ -4447,7 +4438,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 4443 "RESTSupport.c"
+#line 4434 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -4459,14 +4450,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 4455 "RESTSupport.c"
+#line 4446 "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 4462 "RESTSupport.c"
+#line 4453 "RESTSupport.c"
 			{
 				SoupMultipart* _tmp6_ = NULL;
 				PublishingRESTSupportArgument* _tmp7_ = NULL;
@@ -4487,7 +4478,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 4483 "RESTSupport.c"
+#line 4474 "RESTSupport.c"
 			}
 		}
 	}
@@ -4525,7 +4516,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 4521 "RESTSupport.c"
+#line 4512 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4540,7 +4531,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 4536 "RESTSupport.c"
+#line 4527 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
@@ -4561,7 +4552,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 4557 "RESTSupport.c"
+#line 4548 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
@@ -4579,7 +4570,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 4575 "RESTSupport.c"
+#line 4566 "RESTSupport.c"
 		} else {
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
@@ -4593,7 +4584,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 4589 "RESTSupport.c"
+#line 4580 "RESTSupport.c"
 		}
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4611,11 +4602,9 @@ 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_ = (_tmp24_ != NULL) ? _vala_array_dup2 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
+	_tmp25_ = payload_length;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp25__length1 = _tmp24__length1;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp26_ = soup_buffer_new_take (_tmp25_, _tmp25__length1);
+	_tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	bindable_data = _tmp26_;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4684,7 +4673,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 4680 "RESTSupport.c"
+#line 4669 "RESTSupport.c"
 		gboolean _tmp50_ = FALSE;
 		SoupMessage* _tmp51_ = NULL;
 		SoupMessageHeaders* _tmp52_ = NULL;
@@ -4702,7 +4691,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 4698 "RESTSupport.c"
+#line 4687 "RESTSupport.c"
 		}
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = outbound_message;
@@ -4732,7 +4721,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 4728 "RESTSupport.c"
+#line 4717 "RESTSupport.c"
 	}
 #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp61_ = outbound_message;
@@ -4762,7 +4751,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 4758 "RESTSupport.c"
+#line 4747 "RESTSupport.c"
 		} else {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
@@ -4782,7 +4771,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 4778 "RESTSupport.c"
+#line 4767 "RESTSupport.c"
 		}
 	}
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4797,7 +4786,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 4793 "RESTSupport.c"
+#line 4782 "RESTSupport.c"
 }
 
 
@@ -4810,7 +4799,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 4806 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
 }
 
 
@@ -4821,7 +4810,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 4817 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
 }
 
 
@@ -4839,7 +4828,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 4835 "RESTSupport.c"
+#line 4824 "RESTSupport.c"
 }
 
 
@@ -4866,14 +4855,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 4862 "RESTSupport.c"
+#line 4851 "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 4869 "RESTSupport.c"
+#line 4858 "RESTSupport.c"
 }
 
 
@@ -4891,7 +4880,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 4887 "RESTSupport.c"
+#line 4876 "RESTSupport.c"
 }
 
 
@@ -4913,21 +4902,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 4909 "RESTSupport.c"
+#line 4898 "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 4916 "RESTSupport.c"
+#line 4905 "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 4923 "RESTSupport.c"
+#line 4912 "RESTSupport.c"
 				xmlNode* _tmp3_ = NULL;
 				xmlNode* _tmp4_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4936,7 +4925,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 4932 "RESTSupport.c"
+#line 4921 "RESTSupport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
@@ -4946,7 +4935,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 4942 "RESTSupport.c"
+#line 4931 "RESTSupport.c"
 			}
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
@@ -4956,7 +4945,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 4952 "RESTSupport.c"
+#line 4941 "RESTSupport.c"
 				xmlNode* _tmp9_ = NULL;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
@@ -4964,7 +4953,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 4960 "RESTSupport.c"
+#line 4949 "RESTSupport.c"
 			}
 		}
 	}
@@ -4980,7 +4969,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 4976 "RESTSupport.c"
+#line 4965 "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);
@@ -4988,7 +4977,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 4984 "RESTSupport.c"
+#line 4973 "RESTSupport.c"
 	}
 }
 
@@ -5017,7 +5006,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 5013 "RESTSupport.c"
+#line 5002 "RESTSupport.c"
 		const gchar* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -5040,7 +5029,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 5036 "RESTSupport.c"
+#line 5025 "RESTSupport.c"
 		} else {
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
@@ -5050,14 +5039,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 5046 "RESTSupport.c"
+#line 5035 "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 5053 "RESTSupport.c"
+#line 5042 "RESTSupport.c"
 }
 
 
@@ -5066,21 +5055,21 @@ static gchar* string_chug (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5076 "RESTSupport.c"
+#line 5065 "RESTSupport.c"
 }
 
 
@@ -5089,21 +5078,21 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5099 "RESTSupport.c"
+#line 5088 "RESTSupport.c"
 }
 
 
@@ -5144,7 +5133,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 5140 "RESTSupport.c"
+#line 5129 "RESTSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -5157,11 +5146,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 5153 "RESTSupport.c"
+#line 5142 "RESTSupport.c"
 	}
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 5157 "RESTSupport.c"
+#line 5146 "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");
@@ -5173,7 +5162,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 5169 "RESTSupport.c"
+#line 5158 "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);
@@ -5181,7 +5170,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 5177 "RESTSupport.c"
+#line 5166 "RESTSupport.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5206,7 +5195,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp13_) {
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 5202 "RESTSupport.c"
+#line 5191 "RESTSupport.c"
 	} else {
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -5232,11 +5221,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 5228 "RESTSupport.c"
+#line 5217 "RESTSupport.c"
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 5232 "RESTSupport.c"
+#line 5221 "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");
@@ -5248,7 +5237,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 5244 "RESTSupport.c"
+#line 5233 "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);
@@ -5256,7 +5245,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 5252 "RESTSupport.c"
+#line 5241 "RESTSupport.c"
 		}
 	}
 #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5275,7 +5264,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 5271 "RESTSupport.c"
+#line 5260 "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");
@@ -5287,7 +5276,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 5283 "RESTSupport.c"
+#line 5272 "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);
@@ -5295,7 +5284,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 5291 "RESTSupport.c"
+#line 5280 "RESTSupport.c"
 		}
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5304,7 +5293,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 5300 "RESTSupport.c"
+#line 5289 "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");
@@ -5316,7 +5305,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 5312 "RESTSupport.c"
+#line 5301 "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);
@@ -5324,7 +5313,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 5320 "RESTSupport.c"
+#line 5309 "RESTSupport.c"
 		}
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5347,7 +5336,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 5343 "RESTSupport.c"
+#line 5332 "RESTSupport.c"
 		const gchar* _tmp37_ = NULL;
 		GError* _tmp38_ = NULL;
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5366,7 +5355,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 5362 "RESTSupport.c"
+#line 5351 "RESTSupport.c"
 		} else {
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
@@ -5378,7 +5367,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 5374 "RESTSupport.c"
+#line 5363 "RESTSupport.c"
 		}
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5387,14 +5376,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 5383 "RESTSupport.c"
+#line 5372 "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 5390 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
 }
 
 
@@ -5403,7 +5392,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 5399 "RESTSupport.c"
+#line 5388 "RESTSupport.c"
 	}
 }
 
@@ -5413,11 +5402,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 5409 "RESTSupport.c"
+#line 5398 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5413 "RESTSupport.c"
+#line 5402 "RESTSupport.c"
 	}
 }
 
@@ -5425,37 +5414,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 5421 "RESTSupport.c"
+#line 5410 "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 5428 "RESTSupport.c"
+#line 5417 "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 5435 "RESTSupport.c"
+#line 5424 "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 5439 "RESTSupport.c"
+#line 5428 "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 5443 "RESTSupport.c"
+#line 5432 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5447 "RESTSupport.c"
+#line 5436 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5451 "RESTSupport.c"
+#line 5440 "RESTSupport.c"
 }
 
 
@@ -5466,25 +5455,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 5462 "RESTSupport.c"
+#line 5451 "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 5468 "RESTSupport.c"
+#line 5457 "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 5472 "RESTSupport.c"
+#line 5461 "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 5476 "RESTSupport.c"
+#line 5465 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5480 "RESTSupport.c"
+#line 5469 "RESTSupport.c"
 }
 
 
@@ -5498,7 +5487,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 5494 "RESTSupport.c"
+#line 5483 "RESTSupport.c"
 }
 
 
@@ -5507,7 +5496,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 5503 "RESTSupport.c"
+#line 5492 "RESTSupport.c"
 }
 
 
@@ -5527,17 +5516,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 5523 "RESTSupport.c"
+#line 5512 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5527 "RESTSupport.c"
+#line 5516 "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 5533 "RESTSupport.c"
+#line 5522 "RESTSupport.c"
 	}
 }
 
@@ -5556,17 +5545,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 5552 "RESTSupport.c"
+#line 5541 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5556 "RESTSupport.c"
+#line 5545 "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 5562 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
 	}
 }
 
@@ -5578,7 +5567,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 5574 "RESTSupport.c"
+#line 5563 "RESTSupport.c"
 }
 
 
@@ -5587,7 +5576,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 5583 "RESTSupport.c"
+#line 5572 "RESTSupport.c"
 }
 
 
@@ -5602,7 +5591,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 5598 "RESTSupport.c"
+#line 5587 "RESTSupport.c"
 }
 
 
@@ -5627,7 +5616,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 5623 "RESTSupport.c"
+#line 5612 "RESTSupport.c"
 }
 
 
@@ -5640,7 +5629,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 5636 "RESTSupport.c"
+#line 5625 "RESTSupport.c"
 	}
 }
 
@@ -5669,7 +5658,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 5665 "RESTSupport.c"
+#line 5654 "RESTSupport.c"
 		gint current_char_value = 0;
 		const gchar* _tmp3_ = NULL;
 		gunichar _tmp4_ = 0U;
@@ -5693,55 +5682,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 5689 "RESTSupport.c"
+#line 5678 "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 5695 "RESTSupport.c"
+#line 5684 "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 5701 "RESTSupport.c"
+#line 5690 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5705 "RESTSupport.c"
+#line 5694 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5709 "RESTSupport.c"
+#line 5698 "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 5715 "RESTSupport.c"
+#line 5704 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5719 "RESTSupport.c"
+#line 5708 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5723 "RESTSupport.c"
+#line 5712 "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 5729 "RESTSupport.c"
+#line 5718 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5733 "RESTSupport.c"
+#line 5722 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5737 "RESTSupport.c"
+#line 5726 "RESTSupport.c"
 			GString* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			gunichar _tmp15_ = 0U;
@@ -5753,7 +5742,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 5749 "RESTSupport.c"
+#line 5738 "RESTSupport.c"
 		} else {
 			GString* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
@@ -5771,7 +5760,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 5767 "RESTSupport.c"
+#line 5756 "RESTSupport.c"
 		}
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
@@ -5783,7 +5772,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 5779 "RESTSupport.c"
+#line 5768 "RESTSupport.c"
 	}
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
@@ -5799,28 +5788,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 5795 "RESTSupport.c"
+#line 5784 "RESTSupport.c"
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup2 (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 5806 "RESTSupport.c"
+#line 5795 "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 5812 "RESTSupport.c"
+#line 5801 "RESTSupport.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5816 "RESTSupport.c"
+#line 5805 "RESTSupport.c"
 }
 
 
@@ -5841,7 +5830,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_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_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"
@@ -5862,14 +5851,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 5858 "RESTSupport.c"
+#line 5847 "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 5865 "RESTSupport.c"
+#line 5854 "RESTSupport.c"
 }
 
 
@@ -5889,7 +5878,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 5885 "RESTSupport.c"
+#line 5874 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -5901,14 +5890,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 5897 "RESTSupport.c"
+#line 5886 "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 5904 "RESTSupport.c"
+#line 5893 "RESTSupport.c"
 			{
 				GFile* file = NULL;
 				SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5941,7 +5930,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 5937 "RESTSupport.c"
+#line 5926 "RESTSupport.c"
 					gint _tmp5_ = 0;
 #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
@@ -5953,7 +5942,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 5949 "RESTSupport.c"
+#line 5938 "RESTSupport.c"
 				}
 #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
@@ -5969,7 +5958,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 5965 "RESTSupport.c"
+#line 5954 "RESTSupport.c"
 					SpitPublishingProgressCallback _tmp9_ = NULL;
 					void* _tmp9__target = NULL;
 					gint _tmp10_ = 0;
@@ -5984,7 +5973,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 5980 "RESTSupport.c"
+#line 5969 "RESTSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
@@ -6002,7 +5991,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 5998 "RESTSupport.c"
+#line 5987 "RESTSupport.c"
 				{
 					PublishingRESTSupportTransaction* _tmp17_ = NULL;
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6013,7 +6002,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 6009 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6028,7 +6017,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 6024 "RESTSupport.c"
+#line 6013 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
@@ -6048,7 +6037,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 6044 "RESTSupport.c"
+#line 6033 "RESTSupport.c"
 				}
 				__finally3:
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6065,7 +6054,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 6061 "RESTSupport.c"
+#line 6050 "RESTSupport.c"
 				}
 #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
@@ -6085,7 +6074,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 6081 "RESTSupport.c"
+#line 6070 "RESTSupport.c"
 				}
 #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
@@ -6097,7 +6086,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 6093 "RESTSupport.c"
+#line 6082 "RESTSupport.c"
 			}
 		}
 	}
@@ -6105,13 +6094,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 6101 "RESTSupport.c"
+#line 6090 "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 6107 "RESTSupport.c"
+#line 6096 "RESTSupport.c"
 	}
 }
 
@@ -6160,7 +6149,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 6156 "RESTSupport.c"
+#line 6145 "RESTSupport.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
@@ -6175,7 +6164,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 6171 "RESTSupport.c"
+#line 6160 "RESTSupport.c"
 	}
 }
 
@@ -6194,7 +6183,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	result = _tmp1_;
 #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6190 "RESTSupport.c"
+#line 6179 "RESTSupport.c"
 }
 
 
@@ -6221,7 +6210,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 6217 "RESTSupport.c"
+#line 6206 "RESTSupport.c"
 }
 
 
@@ -6230,7 +6219,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 6226 "RESTSupport.c"
+#line 6215 "RESTSupport.c"
 }
 
 
@@ -6239,7 +6228,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 6235 "RESTSupport.c"
+#line 6224 "RESTSupport.c"
 }
 
 
@@ -6266,7 +6255,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 6262 "RESTSupport.c"
+#line 6251 "RESTSupport.c"
 	}
 }
 
@@ -6274,7 +6263,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 6270 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
 }
 
 
@@ -6283,7 +6272,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 6279 "RESTSupport.c"
+#line 6268 "RESTSupport.c"
 	}
 }
 
@@ -6293,11 +6282,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 6289 "RESTSupport.c"
+#line 6278 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6293 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
 	}
 }
 
@@ -6305,37 +6294,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 6301 "RESTSupport.c"
+#line 6290 "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 6308 "RESTSupport.c"
+#line 6297 "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 6315 "RESTSupport.c"
+#line 6304 "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 6319 "RESTSupport.c"
+#line 6308 "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 6323 "RESTSupport.c"
+#line 6312 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6327 "RESTSupport.c"
+#line 6316 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6331 "RESTSupport.c"
+#line 6320 "RESTSupport.c"
 }
 
 
@@ -6346,25 +6335,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 6342 "RESTSupport.c"
+#line 6331 "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 6348 "RESTSupport.c"
+#line 6337 "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 6352 "RESTSupport.c"
+#line 6341 "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 6356 "RESTSupport.c"
+#line 6345 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6360 "RESTSupport.c"
+#line 6349 "RESTSupport.c"
 }
 
 
@@ -6378,7 +6367,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 6374 "RESTSupport.c"
+#line 6363 "RESTSupport.c"
 }
 
 
@@ -6387,7 +6376,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 6383 "RESTSupport.c"
+#line 6372 "RESTSupport.c"
 }
 
 
@@ -6407,17 +6396,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 6403 "RESTSupport.c"
+#line 6392 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6407 "RESTSupport.c"
+#line 6396 "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 6413 "RESTSupport.c"
+#line 6402 "RESTSupport.c"
 	}
 }
 
@@ -6436,17 +6425,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 6432 "RESTSupport.c"
+#line 6421 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6436 "RESTSupport.c"
+#line 6425 "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 6442 "RESTSupport.c"
+#line 6431 "RESTSupport.c"
 	}
 }
 
@@ -6464,7 +6453,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 6460 "RESTSupport.c"
+#line 6449 "RESTSupport.c"
 }
 
 
@@ -6485,7 +6474,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 6481 "RESTSupport.c"
+#line 6470 "RESTSupport.c"
 }
 
 
@@ -6499,7 +6488,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 6495 "RESTSupport.c"
+#line 6484 "RESTSupport.c"
 }
 
 
@@ -6524,7 +6513,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 6520 "RESTSupport.c"
+#line 6509 "RESTSupport.c"
 }
 
 
@@ -6537,7 +6526,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 6533 "RESTSupport.c"
+#line 6522 "RESTSupport.c"
 	}
 }
 
@@ -6546,17 +6535,17 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
 	glong _tmp0_ = 0L;
 	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6552 "RESTSupport.c"
+#line 6541 "RESTSupport.c"
 }
 
 
@@ -6582,7 +6571,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 6578 "RESTSupport.c"
+#line 6567 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -6590,14 +6579,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 6586 "RESTSupport.c"
+#line 6575 "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 6593 "RESTSupport.c"
+#line 6582 "RESTSupport.c"
 				const gchar* _tmp7_ = NULL;
 				gunichar _tmp8_ = 0U;
 				gunichar c = 0U;
@@ -6606,7 +6595,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 6602 "RESTSupport.c"
+#line 6591 "RESTSupport.c"
 					const gchar* _tmp5_ = NULL;
 					const gchar* _tmp6_ = NULL;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6615,7 +6604,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 6611 "RESTSupport.c"
+#line 6600 "RESTSupport.c"
 				}
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -6627,7 +6616,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 6623 "RESTSupport.c"
+#line 6612 "RESTSupport.c"
 				}
 #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
@@ -6639,7 +6628,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 6635 "RESTSupport.c"
+#line 6624 "RESTSupport.c"
 					GString* _tmp12_ = NULL;
 					gunichar _tmp13_ = 0U;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6648,7 +6637,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 6644 "RESTSupport.c"
+#line 6633 "RESTSupport.c"
 				}
 			}
 		}
@@ -6667,7 +6656,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 6663 "RESTSupport.c"
+#line 6652 "RESTSupport.c"
 }
 
 
@@ -6676,7 +6665,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 6672 "RESTSupport.c"
+#line 6661 "RESTSupport.c"
 }
 
 
@@ -6685,7 +6674,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 6681 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
 }
 
 
@@ -6694,7 +6683,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 6690 "RESTSupport.c"
+#line 6679 "RESTSupport.c"
 }
 
 
@@ -6703,7 +6692,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 6699 "RESTSupport.c"
+#line 6688 "RESTSupport.c"
 }
 
 
@@ -6712,7 +6701,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 6708 "RESTSupport.c"
+#line 6697 "RESTSupport.c"
 }
 
 
@@ -6721,7 +6710,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 6717 "RESTSupport.c"
+#line 6706 "RESTSupport.c"
 }
 
 
@@ -6730,7 +6719,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 6726 "RESTSupport.c"
+#line 6715 "RESTSupport.c"
 }
 
 
@@ -6739,7 +6728,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 6735 "RESTSupport.c"
+#line 6724 "RESTSupport.c"
 }
 
 
@@ -6749,7 +6738,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 6745 "RESTSupport.c"
+#line 6734 "RESTSupport.c"
 }
 
 
@@ -6764,7 +6753,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 6760 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
 }
 
 
@@ -6827,14 +6816,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 6823 "RESTSupport.c"
+#line 6812 "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 6830 "RESTSupport.c"
+#line 6819 "RESTSupport.c"
 }
 
 
@@ -6868,27 +6857,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 6863 "RESTSupport.c"
+#line 6852 "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 6869 "RESTSupport.c"
+#line 6858 "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 6876 "RESTSupport.c"
+#line 6865 "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 6883 "RESTSupport.c"
+#line 6872 "RESTSupport.c"
 }
 
 
@@ -6926,7 +6915,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 6920 "RESTSupport.c"
+#line 6909 "RESTSupport.c"
 	}
 #line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
@@ -6938,7 +6927,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 6932 "RESTSupport.c"
+#line 6921 "RESTSupport.c"
 }
 
 
@@ -6986,7 +6975,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 6979 "RESTSupport.c"
+#line 6968 "RESTSupport.c"
 	}
 #line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->host;
@@ -6994,21 +6983,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 6987 "RESTSupport.c"
+#line 6976 "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 6994 "RESTSupport.c"
+#line 6983 "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 7001 "RESTSupport.c"
+#line 6990 "RESTSupport.c"
 }
 
 
@@ -7048,7 +7037,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 7040 "RESTSupport.c"
+#line 7029 "RESTSupport.c"
 	}
 #line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
@@ -7058,7 +7047,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 7050 "RESTSupport.c"
+#line 7039 "RESTSupport.c"
 	}
 #line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
@@ -7070,7 +7059,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 7062 "RESTSupport.c"
+#line 7051 "RESTSupport.c"
 }
 
 
@@ -7111,7 +7100,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 7102 "RESTSupport.c"
+#line 7091 "RESTSupport.c"
 	}
 #line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
@@ -7121,7 +7110,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 7112 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
 	}
 #line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
@@ -7133,7 +7122,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 7124 "RESTSupport.c"
+#line 7113 "RESTSupport.c"
 	}
 #line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = self->priv->host;
@@ -7141,7 +7130,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 7132 "RESTSupport.c"
+#line 7121 "RESTSupport.c"
 }
 
 
@@ -7166,7 +7155,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 7156 "RESTSupport.c"
+#line 7145 "RESTSupport.c"
 	}
 #line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
@@ -7178,7 +7167,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 7168 "RESTSupport.c"
+#line 7157 "RESTSupport.c"
 }
 
 
@@ -7203,7 +7192,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 7192 "RESTSupport.c"
+#line 7181 "RESTSupport.c"
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
@@ -7217,21 +7206,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 7206 "RESTSupport.c"
+#line 7195 "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 7213 "RESTSupport.c"
+#line 7202 "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 7220 "RESTSupport.c"
+#line 7209 "RESTSupport.c"
 }
 
 
@@ -7269,7 +7258,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 7257 "RESTSupport.c"
+#line 7246 "RESTSupport.c"
 	}
 #line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
@@ -7281,7 +7270,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 7269 "RESTSupport.c"
+#line 7258 "RESTSupport.c"
 }
 
 
@@ -7318,7 +7307,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 7305 "RESTSupport.c"
+#line 7294 "RESTSupport.c"
 	}
 #line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->host;
@@ -7326,7 +7315,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 7313 "RESTSupport.c"
+#line 7302 "RESTSupport.c"
 }
 
 
@@ -7360,7 +7349,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 7346 "RESTSupport.c"
+#line 7335 "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_);
@@ -7368,7 +7357,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 7354 "RESTSupport.c"
+#line 7343 "RESTSupport.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
 #line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7379,7 +7368,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 7365 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
 		}
 	}
 	goto __finally4;
@@ -7400,7 +7389,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 7386 "RESTSupport.c"
+#line 7375 "RESTSupport.c"
 	}
 	__finally4:
 #line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7413,11 +7402,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 7399 "RESTSupport.c"
+#line 7388 "RESTSupport.c"
 	}
 #line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7403 "RESTSupport.c"
+#line 7392 "RESTSupport.c"
 }
 
 
@@ -7557,7 +7546,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 7542 "RESTSupport.c"
+#line 7531 "RESTSupport.c"
 }
 
 
@@ -7586,7 +7575,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 7570 "RESTSupport.c"
+#line 7559 "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_);
@@ -7594,7 +7583,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 7578 "RESTSupport.c"
+#line 7567 "RESTSupport.c"
 				goto __catch5_spit_publishing_publishing_error;
 			}
 #line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7605,7 +7594,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 7589 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
 		}
 	}
 	goto __finally5;
@@ -7626,7 +7615,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 7610 "RESTSupport.c"
+#line 7599 "RESTSupport.c"
 	}
 	__finally5:
 #line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7639,18 +7628,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 7623 "RESTSupport.c"
+#line 7612 "RESTSupport.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7627 "RESTSupport.c"
+#line 7616 "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 7634 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
 }
 
 
@@ -7681,7 +7670,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 7664 "RESTSupport.c"
+#line 7653 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -7693,7 +7682,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 7676 "RESTSupport.c"
+#line 7665 "RESTSupport.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -7738,7 +7727,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 7721 "RESTSupport.c"
+#line 7710 "RESTSupport.c"
 	}
 	__finally6:
 #line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7751,7 +7740,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 7734 "RESTSupport.c"
+#line 7723 "RESTSupport.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
@@ -7769,7 +7758,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 7752 "RESTSupport.c"
+#line 7741 "RESTSupport.c"
 		JsonObject* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7778,15 +7767,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 7761 "RESTSupport.c"
+#line 7750 "RESTSupport.c"
 	} else {
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = FALSE;
-#line 7765 "RESTSupport.c"
+#line 7754 "RESTSupport.c"
 	}
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp14_) {
-#line 7769 "RESTSupport.c"
+#line 7758 "RESTSupport.c"
 		SpitPublishingPluginHost* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
 		GError* _tmp21_ = NULL;
@@ -7806,7 +7795,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 7789 "RESTSupport.c"
+#line 7778 "RESTSupport.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = response_obj;
@@ -7814,7 +7803,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 7797 "RESTSupport.c"
+#line 7786 "RESTSupport.c"
 		gchar* refresh_token = NULL;
 		JsonObject* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
@@ -7832,17 +7821,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 7815 "RESTSupport.c"
+#line 7804 "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 7821 "RESTSupport.c"
+#line 7810 "RESTSupport.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (refresh_token);
-#line 7825 "RESTSupport.c"
+#line 7814 "RESTSupport.c"
 	}
 #line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = response_obj;
@@ -7850,7 +7839,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 7833 "RESTSupport.c"
+#line 7822 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
@@ -7868,23 +7857,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 7851 "RESTSupport.c"
+#line 7840 "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 7857 "RESTSupport.c"
+#line 7846 "RESTSupport.c"
 		}
 #line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 7861 "RESTSupport.c"
+#line 7850 "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 7867 "RESTSupport.c"
+#line 7856 "RESTSupport.c"
 }
 
 
@@ -7918,13 +7907,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 7900 "RESTSupport.c"
+#line 7889 "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 7906 "RESTSupport.c"
+#line 7895 "RESTSupport.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -7946,7 +7935,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 7928 "RESTSupport.c"
+#line 7917 "RESTSupport.c"
 	}
 	__finally7:
 #line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7959,11 +7948,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 7941 "RESTSupport.c"
+#line 7930 "RESTSupport.c"
 	}
 #line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7945 "RESTSupport.c"
+#line 7934 "RESTSupport.c"
 }
 
 
@@ -7993,7 +7982,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 7974 "RESTSupport.c"
+#line 7963 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8005,7 +7994,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 7986 "RESTSupport.c"
+#line 7975 "RESTSupport.c"
 			goto __catch8_g_error;
 		}
 	}
@@ -8050,7 +8039,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 8031 "RESTSupport.c"
+#line 8020 "RESTSupport.c"
 	}
 	__finally8:
 #line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8063,7 +8052,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 8044 "RESTSupport.c"
+#line 8033 "RESTSupport.c"
 	}
 #line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
@@ -8081,7 +8070,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 8062 "RESTSupport.c"
+#line 8051 "RESTSupport.c"
 		gchar* username = NULL;
 		JsonObject* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -8099,7 +8088,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 8080 "RESTSupport.c"
+#line 8069 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
 			const gchar* _tmp21_ = NULL;
 			gchar* _tmp22_ = NULL;
@@ -8113,11 +8102,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 8094 "RESTSupport.c"
+#line 8083 "RESTSupport.c"
 		}
 #line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (username);
-#line 8098 "RESTSupport.c"
+#line 8087 "RESTSupport.c"
 	}
 #line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = response_obj;
@@ -8125,7 +8114,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 8106 "RESTSupport.c"
+#line 8095 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -8143,7 +8132,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 8124 "RESTSupport.c"
+#line 8113 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -8157,11 +8146,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 8138 "RESTSupport.c"
+#line 8127 "RESTSupport.c"
 		}
 #line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 8142 "RESTSupport.c"
+#line 8131 "RESTSupport.c"
 	}
 #line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = self->priv->session;
@@ -8175,7 +8164,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 8156 "RESTSupport.c"
+#line 8145 "RESTSupport.c"
 }
 
 
@@ -8190,7 +8179,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 8171 "RESTSupport.c"
+#line 8160 "RESTSupport.c"
 }
 
 
@@ -8208,7 +8197,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	result = _tmp1_;
 #line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8189 "RESTSupport.c"
+#line 8178 "RESTSupport.c"
 }
 
 
@@ -8221,21 +8210,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 8202 "RESTSupport.c"
+#line 8191 "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 8208 "RESTSupport.c"
+#line 8197 "RESTSupport.c"
 	} else {
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = FALSE;
-#line 8212 "RESTSupport.c"
+#line 8201 "RESTSupport.c"
 	}
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 8216 "RESTSupport.c"
+#line 8205 "RESTSupport.c"
 		PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -8251,14 +8240,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 8232 "RESTSupport.c"
+#line 8221 "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 8239 "RESTSupport.c"
+#line 8228 "RESTSupport.c"
 			SpitPublishingPluginHost* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 #line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8273,11 +8262,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 8250 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
 		}
 #line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 8254 "RESTSupport.c"
+#line 8243 "RESTSupport.c"
 	}
 }
 
@@ -8287,7 +8276,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 8264 "RESTSupport.c"
+#line 8253 "RESTSupport.c"
 }
 
 
@@ -8296,7 +8285,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 8273 "RESTSupport.c"
+#line 8262 "RESTSupport.c"
 }
 
 
@@ -8305,7 +8294,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 8282 "RESTSupport.c"
+#line 8271 "RESTSupport.c"
 }
 
 
@@ -8314,7 +8303,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 8291 "RESTSupport.c"
+#line 8280 "RESTSupport.c"
 }
 
 
@@ -8323,7 +8312,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 8300 "RESTSupport.c"
+#line 8289 "RESTSupport.c"
 }
 
 
@@ -8332,7 +8321,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 8309 "RESTSupport.c"
+#line 8298 "RESTSupport.c"
 }
 
 
@@ -8341,7 +8330,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 8318 "RESTSupport.c"
+#line 8307 "RESTSupport.c"
 }
 
 
@@ -8350,7 +8339,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 8327 "RESTSupport.c"
+#line 8316 "RESTSupport.c"
 }
 
 
@@ -8359,7 +8348,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 8336 "RESTSupport.c"
+#line 8325 "RESTSupport.c"
 }
 
 
@@ -8368,7 +8357,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 8345 "RESTSupport.c"
+#line 8334 "RESTSupport.c"
 }
 
 
@@ -8387,7 +8376,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 8364 "RESTSupport.c"
+#line 8353 "RESTSupport.c"
 }
 
 
@@ -8409,14 +8398,14 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
 	self->refresh_token = NULL;
 #line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8386 "RESTSupport.c"
+#line 8375 "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 8393 "RESTSupport.c"
+#line 8382 "RESTSupport.c"
 }
 
 
@@ -8432,7 +8421,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 8409 "RESTSupport.c"
+#line 8398 "RESTSupport.c"
 }
 
 
@@ -8456,7 +8445,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 8433 "RESTSupport.c"
+#line 8422 "RESTSupport.c"
 }
 
 
@@ -8480,7 +8469,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 8457 "RESTSupport.c"
+#line 8446 "RESTSupport.c"
 }
 
 
@@ -8504,7 +8493,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 8481 "RESTSupport.c"
+#line 8470 "RESTSupport.c"
 }
 
 
@@ -8524,7 +8513,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 8501 "RESTSupport.c"
+#line 8490 "RESTSupport.c"
 }
 
 
@@ -8543,7 +8532,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 8520 "RESTSupport.c"
+#line 8509 "RESTSupport.c"
 }
 
 
@@ -8563,7 +8552,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 8540 "RESTSupport.c"
+#line 8529 "RESTSupport.c"
 }
 
 
@@ -8590,14 +8579,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 8567 "RESTSupport.c"
+#line 8556 "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 8574 "RESTSupport.c"
+#line 8563 "RESTSupport.c"
 }
 
 
@@ -8610,7 +8599,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 8587 "RESTSupport.c"
+#line 8576 "RESTSupport.c"
 }
 
 
@@ -8621,37 +8610,37 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 8614 "RESTSupport.c"
+#line 8603 "RESTSupport.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8622 "RESTSupport.c"
+#line 8611 "RESTSupport.c"
 	} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8628 "RESTSupport.c"
+#line 8617 "RESTSupport.c"
 	}
 }
 
@@ -8663,39 +8652,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8652 "RESTSupport.c"
+#line 8641 "RESTSupport.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8660 "RESTSupport.c"
+#line 8649 "RESTSupport.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8672 "RESTSupport.c"
+#line 8661 "RESTSupport.c"
 	}
 }
 
@@ -8713,114 +8702,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8696 "RESTSupport.c"
+#line 8685 "RESTSupport.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8702 "RESTSupport.c"
+#line 8691 "RESTSupport.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8706 "RESTSupport.c"
+#line 8695 "RESTSupport.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8710 "RESTSupport.c"
+#line 8699 "RESTSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8722 "RESTSupport.c"
+#line 8711 "RESTSupport.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8732 "RESTSupport.c"
+#line 8721 "RESTSupport.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8738 "RESTSupport.c"
+#line 8727 "RESTSupport.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8752 "RESTSupport.c"
+#line 8741 "RESTSupport.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8762 "RESTSupport.c"
+#line 8751 "RESTSupport.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8768 "RESTSupport.c"
+#line 8757 "RESTSupport.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8777 "RESTSupport.c"
+#line 8766 "RESTSupport.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8797 "RESTSupport.c"
+#line 8786 "RESTSupport.c"
 }
 
 
@@ -8856,7 +8845,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 8833 "RESTSupport.c"
+#line 8822 "RESTSupport.c"
 		gint auth_code_field_start = 0;
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
@@ -8880,7 +8869,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 8857 "RESTSupport.c"
+#line 8846 "RESTSupport.c"
 		}
 #line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp10_ = page_title;
@@ -8898,11 +8887,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 8875 "RESTSupport.c"
+#line 8864 "RESTSupport.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (page_title);
-#line 8879 "RESTSupport.c"
+#line 8868 "RESTSupport.c"
 }
 
 
@@ -8915,7 +8904,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 8892 "RESTSupport.c"
+#line 8881 "RESTSupport.c"
 }
 
 
@@ -8929,7 +8918,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 8906 "RESTSupport.c"
+#line 8895 "RESTSupport.c"
 }
 
 
@@ -8971,21 +8960,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 8948 "RESTSupport.c"
+#line 8937 "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 8955 "RESTSupport.c"
+#line 8944 "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 8962 "RESTSupport.c"
+#line 8951 "RESTSupport.c"
 }
 
 
@@ -9035,21 +9024,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 9012 "RESTSupport.c"
+#line 9001 "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 9019 "RESTSupport.c"
+#line 9008 "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 9026 "RESTSupport.c"
+#line 9015 "RESTSupport.c"
 }
 
 
@@ -9088,14 +9077,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 9065 "RESTSupport.c"
+#line 9054 "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 9072 "RESTSupport.c"
+#line 9061 "RESTSupport.c"
 }
 
 
@@ -9147,21 +9136,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	_g_free0 (_tmp7_);
 #line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9124 "RESTSupport.c"
+#line 9113 "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 9131 "RESTSupport.c"
+#line 9120 "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 9138 "RESTSupport.c"
+#line 9127 "RESTSupport.c"
 }
 
 
@@ -9192,21 +9181,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 9169 "RESTSupport.c"
+#line 9158 "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 9176 "RESTSupport.c"
+#line 9165 "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 9183 "RESTSupport.c"
+#line 9172 "RESTSupport.c"
 }
 
 
@@ -9243,7 +9232,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 9220 "RESTSupport.c"
+#line 9209 "RESTSupport.c"
 }
 
 
@@ -9258,14 +9247,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 9235 "RESTSupport.c"
+#line 9224 "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 9242 "RESTSupport.c"
+#line 9231 "RESTSupport.c"
 }
 
 
@@ -9281,7 +9270,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 9258 "RESTSupport.c"
+#line 9247 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index b76bead..1a9052b 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.Status.OK:
-            case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
-                                      // resource was created in response to a PUT or POST
+            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
             break;
             
-            case Soup.Status.CANT_RESOLVE:
-            case Soup.Status.CANT_RESOLVE_PROXY:
+            case Soup.KnownStatusCode.CANT_RESOLVE:
+            case Soup.KnownStatusCode.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.Status.CANT_CONNECT:
-            case Soup.Status.CANT_CONNECT_PROXY:
+            case Soup.KnownStatusCode.CANT_CONNECT:
+            case Soup.KnownStatusCode.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.Status.SSL_FAILED:
+            case Soup.KnownStatusCode.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.take (payload.data);
+        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, payload.data[0:payload_length]);
         message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
             bindable_data);
 
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index dc7428b..902db2b 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.32.1, the Vala compiler
+/* Resources.c generated by valac 0.34.4, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index c82e910..1490045 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -1,4 +1,4 @@
-/* WebAuthenticationPane.c generated by valac 0.32.1, the Vala compiler
+/* WebAuthenticationPane.c generated by valac 0.34.4, the Vala compiler
  * generated from WebAuthenticationPane.vala, do not modify */
 
 /* Copyright 2016 Jens Georg <mail@jensge.org>
diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c
index 31d70a7..bc423d1 100644
--- a/plugins/shotwell-data-imports/FSpotDatabase.c
+++ b/plugins/shotwell-data-imports/FSpotDatabase.c
@@ -1,4 +1,4 @@
-/* FSpotDatabase.c generated by valac 0.32.1, the Vala compiler
+/* FSpotDatabase.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotDatabase.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
index b20f73f..eee5e75 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
+++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
@@ -1,4 +1,4 @@
-/* FSpotDatabaseBehavior.c generated by valac 0.32.1, the Vala compiler
+/* FSpotDatabaseBehavior.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotDatabaseBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c
index 48e5030..ffbd887 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c
+++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c
@@ -1,4 +1,4 @@
-/* FSpotDatabaseTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotDatabaseTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotDatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -211,72 +211,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 221 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 231 "FSpotDatabaseTable.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 241 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 247 "FSpotDatabaseTable.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 258 "FSpotDatabaseTable.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 270 "FSpotDatabaseTable.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 274 "FSpotDatabaseTable.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 278 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 282 "FSpotDatabaseTable.c"
 		gint i = 0;
@@ -299,16 +299,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 305 "FSpotDatabaseTable.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 314 "FSpotDatabaseTable.c"
 				gboolean _tmp11_ = FALSE;
@@ -321,97 +321,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 327 "FSpotDatabaseTable.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 333 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 343 "FSpotDatabaseTable.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 355 "FSpotDatabaseTable.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 359 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 365 "FSpotDatabaseTable.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 376 "FSpotDatabaseTable.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 391 "FSpotDatabaseTable.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 395 "FSpotDatabaseTable.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 399 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 405 "FSpotDatabaseTable.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 417 "FSpotDatabaseTable.c"
 					gchar** _tmp25_ = NULL;
@@ -420,91 +420,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 438 "FSpotDatabaseTable.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 442 "FSpotDatabaseTable.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 448 "FSpotDatabaseTable.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 455 "FSpotDatabaseTable.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 463 "FSpotDatabaseTable.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 501 "FSpotDatabaseTable.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 510 "FSpotDatabaseTable.c"
 				gint _tmp48_ = 0;
@@ -520,94 +520,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 526 "FSpotDatabaseTable.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 532 "FSpotDatabaseTable.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 546 "FSpotDatabaseTable.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 566 "FSpotDatabaseTable.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 581 "FSpotDatabaseTable.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 585 "FSpotDatabaseTable.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 593 "FSpotDatabaseTable.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 604 "FSpotDatabaseTable.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 613 "FSpotDatabaseTable.c"
 	}
diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c
index 5cb73d5..8dc1559 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.c
+++ b/plugins/shotwell-data-imports/FSpotImporter.c
@@ -1,4 +1,4 @@
-/* FSpotImporter.c generated by valac 0.32.1, the Vala compiler
+/* FSpotImporter.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotImporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1661,33 +1661,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1665 "FSpotImporter.c"
 		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1673 "FSpotImporter.c"
 	} else {
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1679 "FSpotImporter.c"
 	}
@@ -1711,103 +1711,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1713 "FSpotImporter.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1722 "FSpotImporter.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1728 "FSpotImporter.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1737 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1743 "FSpotImporter.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1752 "FSpotImporter.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1756 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1764 "FSpotImporter.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1773 "FSpotImporter.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1777 "FSpotImporter.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1799 "FSpotImporter.c"
 }
@@ -1817,15 +1817,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1817 "FSpotImporter.c"
 }
@@ -1838,37 +1838,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1840 "FSpotImporter.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1848 "FSpotImporter.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1860 "FSpotImporter.c"
 	}
@@ -1888,112 +1888,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1884 "FSpotImporter.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1890 "FSpotImporter.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1894 "FSpotImporter.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1898 "FSpotImporter.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1910 "FSpotImporter.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1920 "FSpotImporter.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1926 "FSpotImporter.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1940 "FSpotImporter.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1950 "FSpotImporter.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1956 "FSpotImporter.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1965 "FSpotImporter.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1985 "FSpotImporter.c"
 }
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c
index 5b8a0c1..3be8630 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.c
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.c
@@ -1,4 +1,4 @@
-/* FSpotMetaTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotMetaTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotMetaTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -302,72 +302,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 312 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 322 "FSpotMetaTable.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 332 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 338 "FSpotMetaTable.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 349 "FSpotMetaTable.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 361 "FSpotMetaTable.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 365 "FSpotMetaTable.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 369 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 373 "FSpotMetaTable.c"
 		gint i = 0;
@@ -390,16 +390,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 396 "FSpotMetaTable.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 405 "FSpotMetaTable.c"
 				gboolean _tmp11_ = FALSE;
@@ -412,97 +412,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 418 "FSpotMetaTable.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 424 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 434 "FSpotMetaTable.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 446 "FSpotMetaTable.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 450 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 456 "FSpotMetaTable.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 467 "FSpotMetaTable.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 482 "FSpotMetaTable.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 486 "FSpotMetaTable.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 490 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 496 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 508 "FSpotMetaTable.c"
 					gchar** _tmp25_ = NULL;
@@ -511,91 +511,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 529 "FSpotMetaTable.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 533 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 539 "FSpotMetaTable.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 546 "FSpotMetaTable.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 554 "FSpotMetaTable.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 592 "FSpotMetaTable.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 601 "FSpotMetaTable.c"
 				gint _tmp48_ = 0;
@@ -611,94 +611,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 617 "FSpotMetaTable.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 623 "FSpotMetaTable.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 637 "FSpotMetaTable.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 657 "FSpotMetaTable.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 672 "FSpotMetaTable.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 676 "FSpotMetaTable.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 684 "FSpotMetaTable.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 695 "FSpotMetaTable.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 704 "FSpotMetaTable.c"
 	}
@@ -1113,15 +1113,15 @@ static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
 	const gchar* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1127 "FSpotMetaTable.c"
 }
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
index 27aca60..615eb70 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotoTagsTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotPhotoTagsTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotPhotoTagsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
index 92b63eb..8a40c4b 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotoVersionsTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotPhotoVersionsTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotPhotoVersionsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c
index b610d4f..364919f 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotosTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotPhotosTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotPhotosTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c
index 2814b00..d183ce0 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.c
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.c
@@ -1,4 +1,4 @@
-/* FSpotRollsTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotRollsTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotRollsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c
index 77543b8..3da1646 100644
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.c
+++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c
@@ -1,4 +1,4 @@
-/* FSpotTableBehavior.c generated by valac 0.32.1, the Vala compiler
+/* FSpotTableBehavior.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotTableBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c
index 93805e4..291f238 100644
--- a/plugins/shotwell-data-imports/FSpotTagsTable.c
+++ b/plugins/shotwell-data-imports/FSpotTagsTable.c
@@ -1,4 +1,4 @@
-/* FSpotTagsTable.c generated by valac 0.32.1, the Vala compiler
+/* FSpotTagsTable.c generated by valac 0.34.4, the Vala compiler
  * generated from FSpotTagsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c
index 4abfac9..0dad7df 100644
--- a/plugins/shotwell-data-imports/SqliteSupport.c
+++ b/plugins/shotwell-data-imports/SqliteSupport.c
@@ -1,4 +1,4 @@
-/* SqliteSupport.c generated by valac 0.32.1, the Vala compiler
+/* SqliteSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from SqliteSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c
index dec3778..93ab197 100644
--- a/plugins/shotwell-data-imports/VersionNumber.c
+++ b/plugins/shotwell-data-imports/VersionNumber.c
@@ -1,4 +1,4 @@
-/* VersionNumber.c generated by valac 0.32.1, the Vala compiler
+/* VersionNumber.c generated by valac 0.34.4, the Vala compiler
  * generated from VersionNumber.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -246,72 +246,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 256 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 266 "VersionNumber.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 276 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 282 "VersionNumber.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 293 "VersionNumber.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 305 "VersionNumber.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 309 "VersionNumber.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 313 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 317 "VersionNumber.c"
 		gint i = 0;
@@ -334,16 +334,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 340 "VersionNumber.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 349 "VersionNumber.c"
 				gboolean _tmp11_ = FALSE;
@@ -356,97 +356,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 362 "VersionNumber.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 368 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 378 "VersionNumber.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 390 "VersionNumber.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 394 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 400 "VersionNumber.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 411 "VersionNumber.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 426 "VersionNumber.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 430 "VersionNumber.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 434 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 440 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 452 "VersionNumber.c"
 					gchar** _tmp25_ = NULL;
@@ -455,91 +455,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 473 "VersionNumber.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 477 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 483 "VersionNumber.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 490 "VersionNumber.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 498 "VersionNumber.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 536 "VersionNumber.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 545 "VersionNumber.c"
 				gint _tmp48_ = 0;
@@ -555,94 +555,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 561 "VersionNumber.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 567 "VersionNumber.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 581 "VersionNumber.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 601 "VersionNumber.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 616 "VersionNumber.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 620 "VersionNumber.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 628 "VersionNumber.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 639 "VersionNumber.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 648 "VersionNumber.c"
 	}
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c
index 0c8ea43..df48222 100644
--- a/plugins/shotwell-data-imports/shotwell-data-imports.c
+++ b/plugins/shotwell-data-imports/shotwell-data-imports.c
@@ -1,4 +1,4 @@
-/* shotwell-data-imports.c generated by valac 0.32.1, the Vala compiler
+/* shotwell-data-imports.c generated by valac 0.34.4, the Vala compiler
  * generated from shotwell-data-imports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index 3019306..731434a 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -1,4 +1,4 @@
-/* shotwell-plugin-common.h generated by valac 0.32.1, the Vala compiler, do not modify */
+/* shotwell-plugin-common.h generated by valac 0.34.4, the Vala compiler, do not modify */
 
 
 #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index b7882b8..93e24e1 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -1,4 +1,4 @@
-/* shotwell-plugin-common.vapi generated by valac 0.32.1, do not modify. */
+/* shotwell-plugin-common.vapi generated by valac 0.34.4, do not modify. */
 
 namespace Publishing {
 	namespace RESTSupport {
diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h
index fb72125..668df4d 100644
--- a/plugins/shotwell-plugin-dev-1.0.h
+++ b/plugins/shotwell-plugin-dev-1.0.h
@@ -1,4 +1,4 @@
-/* shotwell-plugin-dev-1.0.h generated by valac 0.32.1, the Vala compiler, do not modify */
+/* shotwell-plugin-dev-1.0.h generated by valac 0.34.4, the Vala compiler, do not modify */
 
 
 #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__
diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi
index e065dab..d88dfd2 100644
--- a/plugins/shotwell-plugin-dev-1.0.vapi
+++ b/plugins/shotwell-plugin-dev-1.0.vapi
@@ -1,4 +1,4 @@
-/* shotwell-plugin-dev-1.0.vapi generated by valac 0.32.1, do not modify. */
+/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.4, do not modify. */
 
 namespace Spit {
 	namespace DataImports {
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 7b4b296..a2e4c0e 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.c
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.c
@@ -1,4 +1,4 @@
-/* GalleryConnector.c generated by valac 0.32.1, the Vala compiler
+/* GalleryConnector.c generated by valac 0.34.4, the Vala compiler
  * generated from GalleryConnector.vala, do not modify */
 
 /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org
@@ -2105,15 +2105,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2088 "GalleryConnector.c"
 }
@@ -2499,103 +2499,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 2484 "GalleryConnector.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 2493 "GalleryConnector.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 2499 "GalleryConnector.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 2508 "GalleryConnector.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 2514 "GalleryConnector.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 2523 "GalleryConnector.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 2527 "GalleryConnector.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 2535 "GalleryConnector.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 2544 "GalleryConnector.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 2548 "GalleryConnector.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2570 "GalleryConnector.c"
 }
@@ -3099,72 +3099,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 3078 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 3088 "GalleryConnector.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 3098 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 3104 "GalleryConnector.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 3115 "GalleryConnector.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 3127 "GalleryConnector.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 3131 "GalleryConnector.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 3135 "GalleryConnector.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 3139 "GalleryConnector.c"
 		gint i = 0;
@@ -3187,16 +3187,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 3162 "GalleryConnector.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 3171 "GalleryConnector.c"
 				gboolean _tmp11_ = FALSE;
@@ -3209,97 +3209,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 3184 "GalleryConnector.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 3190 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 3200 "GalleryConnector.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 3212 "GalleryConnector.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 3216 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 3222 "GalleryConnector.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 3233 "GalleryConnector.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 3248 "GalleryConnector.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 3252 "GalleryConnector.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 3256 "GalleryConnector.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 3262 "GalleryConnector.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 3274 "GalleryConnector.c"
 					gchar** _tmp25_ = NULL;
@@ -3308,91 +3308,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 3295 "GalleryConnector.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 3299 "GalleryConnector.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 3305 "GalleryConnector.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 3312 "GalleryConnector.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 3320 "GalleryConnector.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 3358 "GalleryConnector.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 3367 "GalleryConnector.c"
 				gint _tmp48_ = 0;
@@ -3408,94 +3408,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 3383 "GalleryConnector.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 3389 "GalleryConnector.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 3403 "GalleryConnector.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 3423 "GalleryConnector.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 3438 "GalleryConnector.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 3442 "GalleryConnector.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 3450 "GalleryConnector.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3461 "GalleryConnector.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3470 "GalleryConnector.c"
 	}
@@ -3839,11 +3839,11 @@ static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int
 
 static const gchar* string_to_string (const gchar* self) {
 	const gchar* result = NULL;
-#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = self;
-#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3818 "GalleryConnector.c"
 }
@@ -9928,19 +9928,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 9905 "GalleryConnector.c"
 }
@@ -10047,37 +10047,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 10022 "GalleryConnector.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10030 "GalleryConnector.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10042 "GalleryConnector.c"
 	}
@@ -10097,112 +10097,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 10066 "GalleryConnector.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 10072 "GalleryConnector.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 10076 "GalleryConnector.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 10080 "GalleryConnector.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 10092 "GalleryConnector.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 10102 "GalleryConnector.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 10108 "GalleryConnector.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 10122 "GalleryConnector.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 10132 "GalleryConnector.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 10138 "GalleryConnector.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 10147 "GalleryConnector.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 10167 "GalleryConnector.c"
 }
@@ -10763,25 +10763,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 10746 "GalleryConnector.c"
 }
@@ -12896,35 +12896,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 12873 "GalleryConnector.c"
 		gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 12881 "GalleryConnector.c"
 	} else {
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 12887 "GalleryConnector.c"
 	}
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index d953d67..f5faf8d 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -1,4 +1,4 @@
-/* RajcePublishing.c generated by valac 0.32.1, the Vala compiler
+/* RajcePublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from RajcePublishing.vala, do not modify */
 
 /* Copyright 2014 rajce.net
@@ -7770,19 +7770,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 7784 "RajcePublishing.c"
 }
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index cac5ead..29249a3 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -1,4 +1,4 @@
-/* TumblrPublishing.c generated by valac 0.32.1, the Vala compiler
+/* TumblrPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from TumblrPublishing.vala, do not modify */
 
 /* Copyright 2012 BJA Electronics
@@ -2803,11 +2803,11 @@ static gpointer _json_object_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 2807 "TumblrPublishing.c"
 	{
@@ -2822,73 +2822,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2838 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2847 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2863 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2874 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 2888 "TumblrPublishing.c"
 	}
@@ -2896,24 +2896,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch35_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 2902 "TumblrPublishing.c"
 	}
 	__finally35:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 2913 "TumblrPublishing.c"
 	}
@@ -6101,39 +6101,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
 #line 6115 "TumblrPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 6121 "TumblrPublishing.c"
 }
@@ -6146,72 +6146,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 6138 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 6148 "TumblrPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 6158 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 6164 "TumblrPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 6175 "TumblrPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 6187 "TumblrPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 6191 "TumblrPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 6195 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 6199 "TumblrPublishing.c"
 		gint i = 0;
@@ -6234,16 +6234,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 6222 "TumblrPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 6231 "TumblrPublishing.c"
 				gboolean _tmp11_ = FALSE;
@@ -6256,97 +6256,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 6244 "TumblrPublishing.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 6250 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 6260 "TumblrPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 6272 "TumblrPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 6276 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 6282 "TumblrPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 6293 "TumblrPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 6308 "TumblrPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 6312 "TumblrPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 6316 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 6322 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 6334 "TumblrPublishing.c"
 					gchar** _tmp25_ = NULL;
@@ -6355,91 +6355,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 6355 "TumblrPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 6359 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 6365 "TumblrPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 6372 "TumblrPublishing.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 6380 "TumblrPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 6418 "TumblrPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 6427 "TumblrPublishing.c"
 				gint _tmp48_ = 0;
@@ -6455,94 +6455,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 6443 "TumblrPublishing.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 6449 "TumblrPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 6463 "TumblrPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 6483 "TumblrPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 6498 "TumblrPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 6502 "TumblrPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 6510 "TumblrPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 6521 "TumblrPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 6530 "TumblrPublishing.c"
 	}
@@ -8042,37 +8042,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 8037 "TumblrPublishing.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8045 "TumblrPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8057 "TumblrPublishing.c"
 	}
@@ -8092,112 +8092,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 8081 "TumblrPublishing.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 8087 "TumblrPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 8091 "TumblrPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 8095 "TumblrPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 8107 "TumblrPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 8117 "TumblrPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 8123 "TumblrPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 8137 "TumblrPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 8147 "TumblrPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 8153 "TumblrPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 8162 "TumblrPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 8182 "TumblrPublishing.c"
 }
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 9118b93..8e71f94 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -1,4 +1,4 @@
-/* YandexPublishing.c generated by valac 0.32.1, the Vala compiler
+/* YandexPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from YandexPublishing.vala, do not modify */
 
 /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -386,7 +386,6 @@ 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))
@@ -463,7 +462,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 467 "YandexPublishing.c"
+#line 466 "YandexPublishing.c"
 }
 
 
@@ -476,7 +475,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 480 "YandexPublishing.c"
+#line 479 "YandexPublishing.c"
 }
 
 
@@ -489,7 +488,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 493 "YandexPublishing.c"
+#line 492 "YandexPublishing.c"
 }
 
 
@@ -556,7 +555,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 560 "YandexPublishing.c"
+#line 559 "YandexPublishing.c"
 }
 
 
@@ -577,7 +576,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 581 "YandexPublishing.c"
+#line 580 "YandexPublishing.c"
 }
 
 
@@ -590,7 +589,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 594 "YandexPublishing.c"
+#line 593 "YandexPublishing.c"
 }
 
 
@@ -598,7 +597,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 602 "YandexPublishing.c"
+#line 601 "YandexPublishing.c"
 }
 
 
@@ -608,21 +607,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 612 "YandexPublishing.c"
+#line 611 "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 619 "YandexPublishing.c"
+#line 618 "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 626 "YandexPublishing.c"
+#line 625 "YandexPublishing.c"
 }
 
 
@@ -639,7 +638,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 643 "YandexPublishing.c"
+#line 642 "YandexPublishing.c"
 }
 
 
@@ -650,7 +649,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 654 "YandexPublishing.c"
+#line 653 "YandexPublishing.c"
 }
 
 
@@ -695,14 +694,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 699 "YandexPublishing.c"
+#line 698 "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 706 "YandexPublishing.c"
+#line 705 "YandexPublishing.c"
 }
 
 
@@ -725,7 +724,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 729 "YandexPublishing.c"
+#line 728 "YandexPublishing.c"
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		PublishingYandexSession* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -754,7 +753,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 758 "YandexPublishing.c"
+#line 757 "YandexPublishing.c"
 	}
 }
 
@@ -775,14 +774,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 779 "YandexPublishing.c"
+#line 778 "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 786 "YandexPublishing.c"
+#line 785 "YandexPublishing.c"
 }
 
 
@@ -801,14 +800,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 805 "YandexPublishing.c"
+#line 804 "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 812 "YandexPublishing.c"
+#line 811 "YandexPublishing.c"
 }
 
 
@@ -834,14 +833,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 838 "YandexPublishing.c"
+#line 837 "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 845 "YandexPublishing.c"
+#line 844 "YandexPublishing.c"
 }
 
 
@@ -857,7 +856,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 861 "YandexPublishing.c"
+#line 860 "YandexPublishing.c"
 }
 
 
@@ -868,7 +867,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 872 "YandexPublishing.c"
+#line 871 "YandexPublishing.c"
 }
 
 
@@ -887,7 +886,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 891 "YandexPublishing.c"
+#line 890 "YandexPublishing.c"
 }
 
 
@@ -905,7 +904,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 909 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
 }
 
 
@@ -918,7 +917,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 922 "YandexPublishing.c"
+#line 921 "YandexPublishing.c"
 }
 
 
@@ -927,7 +926,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 931 "YandexPublishing.c"
+#line 930 "YandexPublishing.c"
 }
 
 
@@ -939,7 +938,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 943 "YandexPublishing.c"
+#line 942 "YandexPublishing.c"
 }
 
 
@@ -966,14 +965,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 970 "YandexPublishing.c"
+#line 969 "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 977 "YandexPublishing.c"
+#line 976 "YandexPublishing.c"
 }
 
 
@@ -982,7 +981,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 986 "YandexPublishing.c"
+#line 985 "YandexPublishing.c"
 }
 
 
@@ -993,7 +992,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 997 "YandexPublishing.c"
+#line 996 "YandexPublishing.c"
 	{
 		GRegex* _tmp0_ = NULL;
 		GRegex* _tmp1_ = NULL;
@@ -1006,7 +1005,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 1010 "YandexPublishing.c"
+#line 1009 "YandexPublishing.c"
 				goto __catch39_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1015,7 +1014,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 1019 "YandexPublishing.c"
+#line 1018 "YandexPublishing.c"
 		}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = _tmp0_;
@@ -1027,7 +1026,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 1031 "YandexPublishing.c"
+#line 1030 "YandexPublishing.c"
 	}
 	goto __finally39;
 	__catch39_g_regex_error:
@@ -1041,7 +1040,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 1045 "YandexPublishing.c"
+#line 1044 "YandexPublishing.c"
 	}
 	__finally39:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1052,7 +1051,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 1056 "YandexPublishing.c"
+#line 1055 "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));
@@ -1062,7 +1061,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 1066 "YandexPublishing.c"
+#line 1065 "YandexPublishing.c"
 }
 
 
@@ -1070,35 +1069,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 1074 "YandexPublishing.c"
+#line 1073 "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 1081 "YandexPublishing.c"
+#line 1080 "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 1088 "YandexPublishing.c"
+#line 1087 "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 1095 "YandexPublishing.c"
+#line 1094 "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 1102 "YandexPublishing.c"
+#line 1101 "YandexPublishing.c"
 }
 
 
@@ -1115,7 +1114,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 1119 "YandexPublishing.c"
+#line 1118 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
 			WebKitPolicyDecision* _tmp1_ = NULL;
@@ -1184,7 +1183,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 1188 "YandexPublishing.c"
+#line 1187 "YandexPublishing.c"
 				gchar* access_token = NULL;
 				GMatchInfo* _tmp17_ = NULL;
 				gchar** _tmp18_ = NULL;
@@ -1224,7 +1223,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 1228 "YandexPublishing.c"
+#line 1227 "YandexPublishing.c"
 					const gchar* _tmp26_ = NULL;
 					WebKitPolicyDecision* _tmp27_ = NULL;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1247,15 +1246,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 1251 "YandexPublishing.c"
+#line 1250 "YandexPublishing.c"
 				} else {
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					g_signal_emit_by_name (self, "login-failed");
-#line 1255 "YandexPublishing.c"
+#line 1254 "YandexPublishing.c"
 				}
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1259 "YandexPublishing.c"
+#line 1258 "YandexPublishing.c"
 			}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp28_ = decision;
@@ -1271,11 +1270,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 1275 "YandexPublishing.c"
+#line 1274 "YandexPublishing.c"
 		}
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1279 "YandexPublishing.c"
+#line 1278 "YandexPublishing.c"
 		{
 			WebKitPolicyDecision* _tmp29_ = NULL;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1284,7 +1283,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 1288 "YandexPublishing.c"
+#line 1287 "YandexPublishing.c"
 		}
 		default:
 		{
@@ -1292,14 +1291,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 1296 "YandexPublishing.c"
+#line 1295 "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 1303 "YandexPublishing.c"
+#line 1302 "YandexPublishing.c"
 }
 
 
@@ -1318,14 +1317,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 1322 "YandexPublishing.c"
+#line 1321 "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 1329 "YandexPublishing.c"
+#line 1328 "YandexPublishing.c"
 }
 
 
@@ -1337,7 +1336,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 1341 "YandexPublishing.c"
+#line 1340 "YandexPublishing.c"
 }
 
 
@@ -1359,21 +1358,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 1363 "YandexPublishing.c"
+#line 1362 "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 1370 "YandexPublishing.c"
+#line 1369 "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 1377 "YandexPublishing.c"
+#line 1376 "YandexPublishing.c"
 }
 
 
@@ -1382,7 +1381,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 1386 "YandexPublishing.c"
+#line 1385 "YandexPublishing.c"
 	}
 }
 
@@ -1392,11 +1391,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 1396 "YandexPublishing.c"
+#line 1395 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1400 "YandexPublishing.c"
+#line 1399 "YandexPublishing.c"
 	}
 }
 
@@ -1404,37 +1403,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 1408 "YandexPublishing.c"
+#line 1407 "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 1415 "YandexPublishing.c"
+#line 1414 "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 1422 "YandexPublishing.c"
+#line 1421 "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 1426 "YandexPublishing.c"
+#line 1425 "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 1430 "YandexPublishing.c"
+#line 1429 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1434 "YandexPublishing.c"
+#line 1433 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1438 "YandexPublishing.c"
+#line 1437 "YandexPublishing.c"
 }
 
 
@@ -1445,25 +1444,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 1449 "YandexPublishing.c"
+#line 1448 "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 1455 "YandexPublishing.c"
+#line 1454 "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 1459 "YandexPublishing.c"
+#line 1458 "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 1463 "YandexPublishing.c"
+#line 1462 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1467 "YandexPublishing.c"
+#line 1466 "YandexPublishing.c"
 }
 
 
@@ -1477,7 +1476,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 1481 "YandexPublishing.c"
+#line 1480 "YandexPublishing.c"
 }
 
 
@@ -1486,7 +1485,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 1490 "YandexPublishing.c"
+#line 1489 "YandexPublishing.c"
 }
 
 
@@ -1506,17 +1505,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 1510 "YandexPublishing.c"
+#line 1509 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1514 "YandexPublishing.c"
+#line 1513 "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 1520 "YandexPublishing.c"
+#line 1519 "YandexPublishing.c"
 	}
 }
 
@@ -1535,17 +1534,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 1539 "YandexPublishing.c"
+#line 1538 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1543 "YandexPublishing.c"
+#line 1542 "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 1549 "YandexPublishing.c"
+#line 1548 "YandexPublishing.c"
 	}
 }
 
@@ -1555,7 +1554,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 1559 "YandexPublishing.c"
+#line 1558 "YandexPublishing.c"
 }
 
 
@@ -1570,7 +1569,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 1574 "YandexPublishing.c"
+#line 1573 "YandexPublishing.c"
 }
 
 
@@ -1586,7 +1585,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 1590 "YandexPublishing.c"
+#line 1589 "YandexPublishing.c"
 }
 
 
@@ -1611,7 +1610,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 1615 "YandexPublishing.c"
+#line 1614 "YandexPublishing.c"
 }
 
 
@@ -1624,7 +1623,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 1628 "YandexPublishing.c"
+#line 1627 "YandexPublishing.c"
 	}
 }
 
@@ -1638,7 +1637,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 1642 "YandexPublishing.c"
+#line 1641 "YandexPublishing.c"
 }
 
 
@@ -1646,7 +1645,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 1650 "YandexPublishing.c"
+#line 1649 "YandexPublishing.c"
 }
 
 
@@ -1654,7 +1653,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 1658 "YandexPublishing.c"
+#line 1657 "YandexPublishing.c"
 }
 
 
@@ -1673,21 +1672,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 1677 "YandexPublishing.c"
+#line 1676 "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 1684 "YandexPublishing.c"
+#line 1683 "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 1691 "YandexPublishing.c"
+#line 1690 "YandexPublishing.c"
 }
 
 
@@ -1716,7 +1715,7 @@ 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 1720 "YandexPublishing.c"
+#line 1719 "YandexPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 		GtkBuilder* _tmp3_ = NULL;
@@ -1755,7 +1754,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 1759 "YandexPublishing.c"
+#line 1758 "YandexPublishing.c"
 			goto __catch40_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1780,7 +1779,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 1784 "YandexPublishing.c"
+#line 1783 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
 			GeeHashMap* _tmp11_ = NULL;
@@ -1807,7 +1806,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 1811 "YandexPublishing.c"
+#line 1810 "YandexPublishing.c"
 				GeeIterator* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
 				gchar* key = NULL;
@@ -1823,7 +1822,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				if (!_tmp18_) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1827 "YandexPublishing.c"
+#line 1826 "YandexPublishing.c"
 				}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _key_it;
@@ -1839,11 +1838,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 1843 "YandexPublishing.c"
+#line 1842 "YandexPublishing.c"
 			}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 1847 "YandexPublishing.c"
+#line 1846 "YandexPublishing.c"
 		}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp23_ = self->priv->album_list;
@@ -1895,7 +1894,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		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 (content);
-#line 1899 "YandexPublishing.c"
+#line 1898 "YandexPublishing.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
@@ -1915,7 +1914,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		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 1919 "YandexPublishing.c"
+#line 1918 "YandexPublishing.c"
 	}
 	__finally40:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1926,18 +1925,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 1930 "YandexPublishing.c"
+#line 1929 "YandexPublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1934 "YandexPublishing.c"
+#line 1933 "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 1941 "YandexPublishing.c"
+#line 1940 "YandexPublishing.c"
 }
 
 
@@ -1946,7 +1945,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 1950 "YandexPublishing.c"
+#line 1949 "YandexPublishing.c"
 }
 
 
@@ -2047,7 +2046,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 2051 "YandexPublishing.c"
+#line 2050 "YandexPublishing.c"
 }
 
 
@@ -2062,7 +2061,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 2066 "YandexPublishing.c"
+#line 2065 "YandexPublishing.c"
 }
 
 
@@ -2077,14 +2076,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 2081 "YandexPublishing.c"
+#line 2080 "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 2088 "YandexPublishing.c"
+#line 2087 "YandexPublishing.c"
 }
 
 
@@ -2104,7 +2103,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 2108 "YandexPublishing.c"
+#line 2107 "YandexPublishing.c"
 }
 
 
@@ -2146,14 +2145,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 2150 "YandexPublishing.c"
+#line 2149 "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 2157 "YandexPublishing.c"
+#line 2156 "YandexPublishing.c"
 }
 
 
@@ -2195,7 +2194,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 2199 "YandexPublishing.c"
+#line 2198 "YandexPublishing.c"
 }
 
 
@@ -2208,14 +2207,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 2212 "YandexPublishing.c"
+#line 2211 "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 2219 "YandexPublishing.c"
+#line 2218 "YandexPublishing.c"
 }
 
 
@@ -2225,7 +2224,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 2229 "YandexPublishing.c"
+#line 2228 "YandexPublishing.c"
 }
 
 
@@ -2243,26 +2242,26 @@ GType publishing_yandex_uploader_get_type (void) {
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2249 "YandexPublishing.c"
+#line 2248 "YandexPublishing.c"
 		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2257 "YandexPublishing.c"
+#line 2256 "YandexPublishing.c"
 	} else {
 		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2266 "YandexPublishing.c"
+#line 2265 "YandexPublishing.c"
 	}
 }
 
@@ -2270,7 +2269,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 2274 "YandexPublishing.c"
+#line 2273 "YandexPublishing.c"
 }
 
 
@@ -2286,62 +2285,55 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2318 "YandexPublishing.c"
+#line 2317 "YandexPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#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"
+#line 2323 "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 2338 "YandexPublishing.c"
+#line 2330 "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 2345 "YandexPublishing.c"
+#line 2337 "YandexPublishing.c"
 }
 
 
@@ -2383,38 +2375,36 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	gint _tmp41__length1 = 0;
 	guint8* _tmp42_ = NULL;
 	gint _tmp42__length1 = 0;
-	guint8* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	SoupBuffer* _tmp44_ = NULL;
-	SpitPublishingPublishable* _tmp45_ = NULL;
+	SoupBuffer* _tmp43_ = NULL;
+	SpitPublishingPublishable* _tmp44_ = NULL;
+	GFile* _tmp45_ = NULL;
 	GFile* _tmp46_ = NULL;
-	GFile* _tmp47_ = NULL;
+	gchar* _tmp47_ = NULL;
 	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
-	SoupMessageHeaders* _tmp50_ = NULL;
-	SoupBuffer* _tmp51_ = NULL;
+	SoupMessageHeaders* _tmp49_ = NULL;
+	SoupBuffer* _tmp50_ = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp52_ = NULL;
-	GEqualFunc _tmp53_ = NULL;
-	GHashTable* _tmp54_ = NULL;
+	GHashFunc _tmp51_ = NULL;
+	GEqualFunc _tmp52_ = NULL;
+	GHashTable* _tmp53_ = NULL;
+	gchar* _tmp54_ = NULL;
 	gchar* _tmp55_ = NULL;
 	gchar* _tmp56_ = NULL;
 	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
 	SoupMessage* outbound_message = NULL;
+	gchar* _tmp58_ = NULL;
 	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
+	SoupMessage* _tmp60_ = NULL;
 	SoupMessage* _tmp61_ = NULL;
-	SoupMessage* _tmp62_ = NULL;
-	SoupMessageHeaders* _tmp63_ = NULL;
-	PublishingYandexSession* _tmp64_ = NULL;
+	SoupMessageHeaders* _tmp62_ = NULL;
+	PublishingYandexSession* _tmp63_ = NULL;
+	gchar* _tmp64_ = NULL;
 	gchar* _tmp65_ = NULL;
 	gchar* _tmp66_ = NULL;
 	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	SoupMessageHeaders* _tmp69_ = NULL;
+	SoupMessageHeaders* _tmp68_ = 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);
@@ -2500,7 +2490,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 2504 "YandexPublishing.c"
+#line 2494 "YandexPublishing.c"
 	{
 		SpitPublishingPublishable* _tmp26_ = NULL;
 		GFile* _tmp27_ = NULL;
@@ -2535,7 +2525,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 2539 "YandexPublishing.c"
+#line 2529 "YandexPublishing.c"
 				goto __catch41_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2548,7 +2538,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 2552 "YandexPublishing.c"
+#line 2542 "YandexPublishing.c"
 		}
 	}
 	goto __finally41;
@@ -2588,7 +2578,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 2592 "YandexPublishing.c"
+#line 2582 "YandexPublishing.c"
 	}
 	__finally41:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2603,7 +2593,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 2607 "YandexPublishing.c"
+#line 2597 "YandexPublishing.c"
 	}
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp40_ = soup_multipart_get_length (message_parts);
@@ -2616,91 +2606,87 @@ 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_ = (_tmp42_ != NULL) ? _vala_array_dup10 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp43__length1 = _tmp42__length1;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp44_ = soup_buffer_new_take (_tmp43_, _tmp43__length1);
+	_tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	bindable_data = _tmp44_;
+	bindable_data = _tmp43_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp45_ = photo;
+	_tmp44_ = photo;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp46_ = spit_publishing_publishable_get_serialized_file (_tmp45_);
+	_tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp47_ = _tmp46_;
+	_tmp46_ = _tmp45_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp48_ = g_file_get_path (_tmp47_);
+	_tmp47_ = g_file_get_path (_tmp46_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_file (message_parts, "", _tmp49_, "image/jpeg", bindable_data);
+	soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp49_);
+	_g_free0 (_tmp48_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (_tmp47_);
+	_g_object_unref0 (_tmp46_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_get_part (message_parts, image_part_num, &_tmp50_, &_tmp51_);
+	soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_header = _tmp50_;
+	image_part_header = _tmp49_;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_body = _tmp51_;
+	image_part_body = _tmp50_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp52_ = g_str_hash;
+	_tmp51_ = g_str_hash;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp53_ = g_str_equal;
+	_tmp52_ = g_str_equal;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp54_ = g_hash_table_new_full (_tmp52_, _tmp53_, _g_free0_, _g_free0_);
+	_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_result_ = _tmp54_;
+	_result_ = _tmp53_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp55_ = g_strdup ("name");
+	_tmp54_ = g_strdup ("name");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp56_ = g_strdup ("image");
+	_tmp55_ = g_strdup ("image");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp55_, _tmp56_);
+	g_hash_table_insert (_result_, _tmp54_, _tmp55_);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp57_ = g_strdup ("filename");
+	_tmp56_ = g_strdup ("filename");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp58_ = g_strdup ("unused");
+	_tmp57_ = g_strdup ("unused");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp57_, _tmp58_);
+	g_hash_table_insert (_result_, _tmp56_, _tmp57_);
 #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"
-	_tmp59_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp58_ = 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"
-	_tmp60_ = _tmp59_;
+	_tmp59_ = _tmp58_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp61_ = soup_form_request_new_from_multipart (_tmp60_, message_parts);
+	_tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp62_ = _tmp61_;
+	_tmp61_ = _tmp60_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp60_);
+	_g_free0 (_tmp59_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	outbound_message = _tmp62_;
+	outbound_message = _tmp61_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp63_ = outbound_message->request_headers;
+	_tmp62_ = outbound_message->request_headers;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp64_ = session;
+	_tmp63_ = session;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp65_ = publishing_yandex_session_get_auth_token (_tmp64_);
+	_tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp66_ = _tmp65_;
+	_tmp65_ = _tmp64_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp67_ = g_strdup_printf ("OAuth %s", _tmp66_);
+	_tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp68_ = _tmp67_;
+	_tmp67_ = _tmp66_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp63_, "Authorization", _tmp68_);
+	soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp68_);
+	_g_free0 (_tmp67_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp66_);
+	_g_free0 (_tmp65_);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp69_ = outbound_message->request_headers;
+	_tmp68_ = outbound_message->request_headers;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp69_, "Connection", "close");
+	soup_message_headers_append (_tmp68_, "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"
@@ -2715,21 +2701,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 2719 "YandexPublishing.c"
+#line 2705 "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 2726 "YandexPublishing.c"
+#line 2712 "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 2733 "YandexPublishing.c"
+#line 2719 "YandexPublishing.c"
 }
 
 
@@ -2790,14 +2776,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 2794 "YandexPublishing.c"
+#line 2780 "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 2801 "YandexPublishing.c"
+#line 2787 "YandexPublishing.c"
 }
 
 
@@ -2815,7 +2801,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 2819 "YandexPublishing.c"
+#line 2805 "YandexPublishing.c"
 }
 
 
@@ -2832,7 +2818,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 2836 "YandexPublishing.c"
+#line 2822 "YandexPublishing.c"
 }
 
 
@@ -2844,7 +2830,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 2848 "YandexPublishing.c"
+#line 2834 "YandexPublishing.c"
 }
 
 
@@ -2867,7 +2853,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 2871 "YandexPublishing.c"
+#line 2857 "YandexPublishing.c"
 }
 
 
@@ -2883,7 +2869,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 2887 "YandexPublishing.c"
+#line 2873 "YandexPublishing.c"
 }
 
 
@@ -2902,7 +2888,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 2906 "YandexPublishing.c"
+#line 2892 "YandexPublishing.c"
 }
 
 
@@ -2916,7 +2902,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 2920 "YandexPublishing.c"
+#line 2906 "YandexPublishing.c"
 }
 
 
@@ -2929,7 +2915,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 2933 "YandexPublishing.c"
+#line 2919 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
 		xmlNode* _tmp0_ = NULL;
@@ -2940,14 +2926,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 2944 "YandexPublishing.c"
+#line 2930 "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 2951 "YandexPublishing.c"
+#line 2937 "YandexPublishing.c"
 				xmlNode* _tmp5_ = NULL;
 				xmlNode* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
@@ -2958,7 +2944,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 2962 "YandexPublishing.c"
+#line 2948 "YandexPublishing.c"
 					xmlNode* _tmp3_ = NULL;
 					xmlNode* _tmp4_ = NULL;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2967,7 +2953,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 2971 "YandexPublishing.c"
+#line 2957 "YandexPublishing.c"
 				}
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp2_ = FALSE;
@@ -2977,7 +2963,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 2981 "YandexPublishing.c"
+#line 2967 "YandexPublishing.c"
 				}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = c;
@@ -2985,7 +2971,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 2989 "YandexPublishing.c"
+#line 2975 "YandexPublishing.c"
 					xmlNode* _tmp8_ = NULL;
 					gchar* _tmp9_ = NULL;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2996,7 +2982,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 3000 "YandexPublishing.c"
+#line 2986 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = c;
@@ -3004,7 +2990,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 3008 "YandexPublishing.c"
+#line 2994 "YandexPublishing.c"
 					xmlNode* _tmp13_ = NULL;
 					gchar* _tmp14_ = NULL;
 					gchar* _tmp15_ = NULL;
@@ -3018,15 +3004,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 3022 "YandexPublishing.c"
+#line 3008 "YandexPublishing.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = FALSE;
-#line 3026 "YandexPublishing.c"
+#line 3012 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp10_) {
-#line 3030 "YandexPublishing.c"
+#line 3016 "YandexPublishing.c"
 					xmlNode* _tmp16_ = NULL;
 					gchar* _tmp17_ = NULL;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3037,27 +3023,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 3041 "YandexPublishing.c"
+#line 3027 "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 3047 "YandexPublishing.c"
+#line 3033 "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 3053 "YandexPublishing.c"
+#line 3039 "YandexPublishing.c"
 				} else {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = FALSE;
-#line 3057 "YandexPublishing.c"
+#line 3043 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp18_) {
-#line 3061 "YandexPublishing.c"
+#line 3047 "YandexPublishing.c"
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					GeeHashMap* _tmp23_ = NULL;
@@ -3087,7 +3073,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 3091 "YandexPublishing.c"
+#line 3077 "YandexPublishing.c"
 				}
 			}
 		}
@@ -3096,7 +3082,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 3100 "YandexPublishing.c"
+#line 3086 "YandexPublishing.c"
 }
 
 
@@ -3105,7 +3091,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 3109 "YandexPublishing.c"
+#line 3095 "YandexPublishing.c"
 }
 
 
@@ -3136,7 +3122,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 3140 "YandexPublishing.c"
+#line 3126 "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);
@@ -3144,7 +3130,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 3148 "YandexPublishing.c"
+#line 3134 "YandexPublishing.c"
 		}
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3167,7 +3153,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 3171 "YandexPublishing.c"
+#line 3157 "YandexPublishing.c"
 		} else {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -3177,12 +3163,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 3181 "YandexPublishing.c"
+#line 3167 "YandexPublishing.c"
 		}
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3186 "YandexPublishing.c"
+#line 3172 "YandexPublishing.c"
 }
 
 
@@ -3212,7 +3198,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 3216 "YandexPublishing.c"
+#line 3202 "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);
@@ -3220,7 +3206,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 3224 "YandexPublishing.c"
+#line 3210 "YandexPublishing.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3229,7 +3215,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 3233 "YandexPublishing.c"
+#line 3219 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
 		xmlNode* _tmp4_ = NULL;
@@ -3240,21 +3226,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 3244 "YandexPublishing.c"
+#line 3230 "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 3251 "YandexPublishing.c"
+#line 3237 "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 3258 "YandexPublishing.c"
+#line 3244 "YandexPublishing.c"
 					xmlNode* _tmp7_ = NULL;
 					xmlNode* _tmp8_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3263,7 +3249,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 3267 "YandexPublishing.c"
+#line 3253 "YandexPublishing.c"
 				}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = FALSE;
@@ -3273,7 +3259,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 3277 "YandexPublishing.c"
+#line 3263 "YandexPublishing.c"
 				}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp10_ = e;
@@ -3283,7 +3269,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 3287 "YandexPublishing.c"
+#line 3273 "YandexPublishing.c"
 				}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = e;
@@ -3299,7 +3285,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 3303 "YandexPublishing.c"
+#line 3289 "YandexPublishing.c"
 					} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
@@ -3309,7 +3295,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 3313 "YandexPublishing.c"
+#line 3299 "YandexPublishing.c"
 					}
 				}
 			}
@@ -3317,21 +3303,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 3321 "YandexPublishing.c"
+#line 3307 "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 3328 "YandexPublishing.c"
+#line 3314 "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 3335 "YandexPublishing.c"
+#line 3321 "YandexPublishing.c"
 }
 
 
@@ -3364,7 +3350,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 3368 "YandexPublishing.c"
+#line 3354 "YandexPublishing.c"
 }
 
 
@@ -3396,7 +3382,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 3400 "YandexPublishing.c"
+#line 3386 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3415,7 +3401,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 3419 "YandexPublishing.c"
+#line 3405 "YandexPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3424,7 +3410,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 3428 "YandexPublishing.c"
+#line 3414 "YandexPublishing.c"
 		}
 	}
 	goto __finally42;
@@ -3447,7 +3433,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 3451 "YandexPublishing.c"
+#line 3437 "YandexPublishing.c"
 	}
 	__finally42:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3458,7 +3444,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 3462 "YandexPublishing.c"
+#line 3448 "YandexPublishing.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->album_list;
@@ -3478,7 +3464,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 3482 "YandexPublishing.c"
+#line 3468 "YandexPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
@@ -3493,7 +3479,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 3497 "YandexPublishing.c"
+#line 3483 "YandexPublishing.c"
 	}
 }
 
@@ -3539,7 +3525,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 3542 "YandexPublishing.c"
+#line 3528 "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_);
@@ -3547,7 +3533,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 3550 "YandexPublishing.c"
+#line 3536 "YandexPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3562,7 +3548,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 3565 "YandexPublishing.c"
+#line 3551 "YandexPublishing.c"
 		}
 	}
 	goto __finally43;
@@ -3583,7 +3569,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 3586 "YandexPublishing.c"
+#line 3572 "YandexPublishing.c"
 	}
 	__finally43:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3600,7 +3586,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 3603 "YandexPublishing.c"
+#line 3589 "YandexPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
@@ -3608,21 +3594,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 3611 "YandexPublishing.c"
+#line 3597 "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 3618 "YandexPublishing.c"
+#line 3604 "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 3625 "YandexPublishing.c"
+#line 3611 "YandexPublishing.c"
 }
 
 
@@ -3654,7 +3640,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 3657 "YandexPublishing.c"
+#line 3643 "YandexPublishing.c"
 		SpitPublishingPluginHost* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
@@ -3668,7 +3654,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 3671 "YandexPublishing.c"
+#line 3657 "YandexPublishing.c"
 	}
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->host;
@@ -3678,7 +3664,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 3681 "YandexPublishing.c"
+#line 3667 "YandexPublishing.c"
 }
 
 
@@ -3711,7 +3697,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 3714 "YandexPublishing.c"
+#line 3700 "YandexPublishing.c"
 }
 
 
@@ -3746,14 +3732,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 3748 "YandexPublishing.c"
+#line 3734 "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 3755 "YandexPublishing.c"
+#line 3741 "YandexPublishing.c"
 }
 
 
@@ -3844,7 +3830,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 3846 "YandexPublishing.c"
+#line 3832 "YandexPublishing.c"
 }
 
 
@@ -3859,7 +3845,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 3861 "YandexPublishing.c"
+#line 3847 "YandexPublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->session;
@@ -3871,7 +3857,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 3873 "YandexPublishing.c"
+#line 3859 "YandexPublishing.c"
 }
 
 
@@ -3927,11 +3913,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 3929 "YandexPublishing.c"
+#line 3915 "YandexPublishing.c"
 	} else {
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3933 "YandexPublishing.c"
+#line 3919 "YandexPublishing.c"
 	}
 }
 
@@ -3939,14 +3925,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 3941 "YandexPublishing.c"
+#line 3927 "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 3948 "YandexPublishing.c"
+#line 3934 "YandexPublishing.c"
 }
 
 
@@ -3981,21 +3967,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 3983 "YandexPublishing.c"
+#line 3969 "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 3990 "YandexPublishing.c"
+#line 3976 "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 3997 "YandexPublishing.c"
+#line 3983 "YandexPublishing.c"
 }
 
 
@@ -4040,7 +4026,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 4042 "YandexPublishing.c"
+#line 4028 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -4059,7 +4045,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 4061 "YandexPublishing.c"
+#line 4047 "YandexPublishing.c"
 				goto __catch44_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4068,7 +4054,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 4070 "YandexPublishing.c"
+#line 4056 "YandexPublishing.c"
 		}
 	}
 	goto __finally44;
@@ -4089,7 +4075,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 4091 "YandexPublishing.c"
+#line 4077 "YandexPublishing.c"
 	}
 	__finally44:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4100,7 +4086,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 4102 "YandexPublishing.c"
+#line 4088 "YandexPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = self->priv->options;
@@ -4122,7 +4108,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 4124 "YandexPublishing.c"
+#line 4110 "YandexPublishing.c"
 }
 
 
@@ -4158,7 +4144,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 4160 "YandexPublishing.c"
+#line 4146 "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_);
@@ -4166,7 +4152,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 4168 "YandexPublishing.c"
+#line 4154 "YandexPublishing.c"
 				goto __catch45_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4177,7 +4163,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 4179 "YandexPublishing.c"
+#line 4165 "YandexPublishing.c"
 		}
 	}
 	goto __finally45;
@@ -4198,7 +4184,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 4200 "YandexPublishing.c"
+#line 4186 "YandexPublishing.c"
 	}
 	__finally45:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4211,25 +4197,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 4213 "YandexPublishing.c"
+#line 4199 "YandexPublishing.c"
 	}
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4217 "YandexPublishing.c"
+#line 4203 "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 4224 "YandexPublishing.c"
+#line 4210 "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 4231 "YandexPublishing.c"
+#line 4217 "YandexPublishing.c"
 }
 
 
@@ -4262,7 +4248,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 4264 "YandexPublishing.c"
+#line 4250 "YandexPublishing.c"
 }
 
 
@@ -4301,7 +4287,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 4303 "YandexPublishing.c"
+#line 4289 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
@@ -4330,7 +4316,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 4332 "YandexPublishing.c"
+#line 4318 "YandexPublishing.c"
 				goto __catch46_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4339,7 +4325,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 4341 "YandexPublishing.c"
+#line 4327 "YandexPublishing.c"
 		}
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp12_ = doc;
@@ -4347,7 +4333,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 4349 "YandexPublishing.c"
+#line 4335 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
 			xmlNode* _tmp14_ = NULL;
@@ -4358,20 +4344,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 4360 "YandexPublishing.c"
+#line 4346 "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 4367 "YandexPublishing.c"
+#line 4353 "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 4373 "YandexPublishing.c"
+#line 4359 "YandexPublishing.c"
 						xmlNode* _tmp17_ = NULL;
 						xmlNode* _tmp18_ = NULL;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4380,7 +4366,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 4382 "YandexPublishing.c"
+#line 4368 "YandexPublishing.c"
 					}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = FALSE;
@@ -4390,7 +4376,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 4392 "YandexPublishing.c"
+#line 4378 "YandexPublishing.c"
 					}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = work;
@@ -4400,7 +4386,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 4402 "YandexPublishing.c"
+#line 4388 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
@@ -4412,14 +4398,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 4414 "YandexPublishing.c"
+#line 4400 "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 4421 "YandexPublishing.c"
+#line 4407 "YandexPublishing.c"
 								xmlNode* _tmp27_ = NULL;
 								xmlNode* _tmp28_ = NULL;
 								const gchar* _tmp29_ = NULL;
@@ -4429,7 +4415,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 4431 "YandexPublishing.c"
+#line 4417 "YandexPublishing.c"
 									xmlNode* _tmp25_ = NULL;
 									xmlNode* _tmp26_ = NULL;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4438,7 +4424,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 4440 "YandexPublishing.c"
+#line 4426 "YandexPublishing.c"
 								}
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp24_ = FALSE;
@@ -4448,7 +4434,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 4450 "YandexPublishing.c"
+#line 4436 "YandexPublishing.c"
 								}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp28_ = c;
@@ -4458,7 +4444,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 4460 "YandexPublishing.c"
+#line 4446 "YandexPublishing.c"
 								}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp30_ = c;
@@ -4472,7 +4458,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 4474 "YandexPublishing.c"
+#line 4460 "YandexPublishing.c"
 									gchar* url = NULL;
 									xmlNode* _tmp34_ = NULL;
 									gchar* _tmp35_ = NULL;
@@ -4504,7 +4490,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 4506 "YandexPublishing.c"
+#line 4492 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4514,7 +4500,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 4516 "YandexPublishing.c"
+#line 4502 "YandexPublishing.c"
 	}
 	goto __finally46;
 	__catch46_spit_publishing_publishing_error:
@@ -4534,7 +4520,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 4536 "YandexPublishing.c"
+#line 4522 "YandexPublishing.c"
 	}
 	__finally46:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4545,7 +4531,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 4547 "YandexPublishing.c"
+#line 4533 "YandexPublishing.c"
 	}
 }
 
@@ -4577,7 +4563,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 4579 "YandexPublishing.c"
+#line 4565 "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_);
@@ -4585,7 +4571,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 4587 "YandexPublishing.c"
+#line 4573 "YandexPublishing.c"
 				goto __catch47_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4596,7 +4582,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 4598 "YandexPublishing.c"
+#line 4584 "YandexPublishing.c"
 		}
 	}
 	goto __finally47;
@@ -4617,7 +4603,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 4619 "YandexPublishing.c"
+#line 4605 "YandexPublishing.c"
 	}
 	__finally47:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4630,11 +4616,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 4632 "YandexPublishing.c"
+#line 4618 "YandexPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4636 "YandexPublishing.c"
+#line 4622 "YandexPublishing.c"
 }
 
 
@@ -4663,7 +4649,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 4665 "YandexPublishing.c"
+#line 4651 "YandexPublishing.c"
 }
 
 
@@ -4672,21 +4658,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 4674 "YandexPublishing.c"
+#line 4660 "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 4681 "YandexPublishing.c"
+#line 4667 "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 4688 "YandexPublishing.c"
+#line 4674 "YandexPublishing.c"
 }
 
 
@@ -4731,14 +4717,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 4733 "YandexPublishing.c"
+#line 4719 "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 4740 "YandexPublishing.c"
+#line 4726 "YandexPublishing.c"
 }
 
 
@@ -4753,7 +4739,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 4755 "YandexPublishing.c"
+#line 4741 "YandexPublishing.c"
 }
 
 
@@ -4770,7 +4756,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 4772 "YandexPublishing.c"
+#line 4758 "YandexPublishing.c"
 	}
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
@@ -4779,7 +4765,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 4780 "YandexPublishing.c"
+#line 4766 "YandexPublishing.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
@@ -4789,7 +4775,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 4790 "YandexPublishing.c"
+#line 4776 "YandexPublishing.c"
 		PublishingYandexSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -4813,11 +4799,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 4814 "YandexPublishing.c"
+#line 4800 "YandexPublishing.c"
 	} else {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4818 "YandexPublishing.c"
+#line 4804 "YandexPublishing.c"
 	}
 }
 
@@ -4832,7 +4818,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 4833 "YandexPublishing.c"
+#line 4819 "YandexPublishing.c"
 }
 
 
@@ -4843,7 +4829,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 4844 "YandexPublishing.c"
+#line 4830 "YandexPublishing.c"
 }
 
 
@@ -4858,7 +4844,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 4859 "YandexPublishing.c"
+#line 4845 "YandexPublishing.c"
 }
 
 
@@ -4879,7 +4865,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 4880 "YandexPublishing.c"
+#line 4866 "YandexPublishing.c"
 }
 
 
@@ -4907,7 +4893,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 4908 "YandexPublishing.c"
+#line 4894 "YandexPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index dbfa3de..0bf929e 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -275,7 +275,7 @@ private class UploadTransaction: Transaction {
 
         int image_part_num = message_parts.get_length();
 
-        var bindable_data = new Soup.Buffer.take (photo_data.data);
+        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]);
         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/gallery3_authentication_pane.ui b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
index 1f2dfae..3317805 100644
--- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAction" id="go_back_action">
-    <property name="label" translatable="yes">Go _Back</property>
-  </object>
-  <object class="GtkAction" id="login_action">
-    <property name="label" translatable="yes">_Log in</property>
-  </object>
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkGrid" id="gallery3_auth_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -23,7 +18,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
         <property name="width">5</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -38,8 +32,6 @@
       <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>
@@ -54,7 +46,6 @@
         <property name="left_attach">1</property>
         <property name="top_attach">1</property>
         <property name="width">4</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -68,8 +59,6 @@
       <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>
@@ -83,8 +72,6 @@
       <packing>
         <property name="left_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -96,8 +83,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>
@@ -111,8 +96,6 @@
       <packing>
         <property name="left_attach">3</property>
         <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -123,7 +106,6 @@
         <child>
           <object class="GtkButton" id="go_back_button">
             <property name="label" translatable="yes">Go _Back</property>
-            <property name="related_action">go_back_action</property>
             <property name="width_request">102</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -136,14 +118,11 @@
           <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="GtkButton" id="login_button">
             <property name="label" translatable="yes">_Log in</property>
-            <property name="related_action">login_action</property>
             <property name="width_request">102</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -159,8 +138,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>
       </object>
@@ -168,7 +145,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">6</property>
         <property name="width">5</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -182,8 +158,6 @@
       <packing>
         <property name="left_attach">2</property>
         <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -197,8 +171,6 @@
       <packing>
         <property name="left_attach">3</property>
         <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -211,7 +183,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">4</property>
         <property name="width">5</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
diff --git a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
index fc2824f..8662f8c 100644
--- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
@@ -1,26 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAction" id="logout_action">
-    <property name="label" translatable="yes">_Logout</property>
-  </object>
-  <object class="GtkAction" id="publish_action">
-    <property name="label" translatable="yes">_Publish</property>
-  </object>
-  <object class="GtkRadioAction" id="publish_new_radioaction">
-    <property name="label" translatable="yes">A _new album</property>
-    <property name="draw_as_radio">True</property>
-    <property name="value">1</property>
-    <property name="current_value">1</property>
-  </object>
-  <object class="GtkRadioAction" id="publish_to_existing_radioaction">
-    <property name="label" translatable="yes">An _existing album</property>
-    <property name="draw_as_radio">True</property>
-    <property name="group">publish_new_radioaction</property>
-  </object>
-  <object class="GtkToggleAction" id="strip_metadata_toggleaction">
-    <property name="label" translatable="yes">_Remove location, tag and camera-identifying data before uploading</property>
-  </object>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkGrid" id="pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -28,15 +9,15 @@
       <object class="GtkLabel" id="title_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0.30000001192092896</property>
-        <property name="ypad">16</property>
+        <property name="halign">start</property>
+        <property name="margin_top">16</property>
+        <property name="margin_bottom">16</property>
         <property name="label">'Publishing to $url as $username' (populated in application code)</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -50,49 +31,43 @@
         <property name="column_homogeneous">True</property>
         <child>
           <object class="GtkRadioButton" id="publish_to_existing_radio">
-            <property name="related_action">publish_to_existing_radioaction</property>
+            <property name="label" translatable="yes">An _existing album</property>
             <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="use_underline">True</property>
             <property name="draw_indicator">True</property>
             <property name="group">publish_new_radio</property>
           </object>
           <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="GtkComboBoxText" id="existing_albums_combo">
             <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">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="publish_new_radio">
-            <property name="related_action">publish_new_radioaction</property>
+            <property name="label" translatable="yes">A _new album</property>
             <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="use_underline">True</property>
             <property name="draw_indicator">True</property>
           </object>
           <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>
@@ -104,27 +79,25 @@
           <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>
           <object class="GtkCheckButton" id="strip_metadata_check">
-            <property name="related_action">strip_metadata_toggleaction</property>
+            <property name="label" translatable="yes">_Remove location, tag and camera-identifying data 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="valign">center</property>
             <property name="margin_top">16</property>
             <property name="hexpand">True</property>
-            <property name="xalign">0</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">5</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -137,8 +110,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -155,8 +126,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>
@@ -173,24 +142,18 @@
               <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>
           </object>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="scaling_constraint_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="entry_text_column">0</property>
-            <property name="id_column">1</property>
             <items>
               <item translatable="yes">Original size</item>
               <item translatable="yes">Width or height</item>
@@ -199,8 +162,6 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -214,7 +175,6 @@
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -225,7 +185,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">1</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -241,33 +200,31 @@
         <property name="column_homogeneous">True</property>
         <child>
           <object class="GtkButton" id="logout_button">
-            <property name="related_action">logout_action</property>
+            <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="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="GtkButton" id="publish_button">
-            <property name="related_action">publish_action</property>
+            <property name="label" translatable="yes">_Publish</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="is_focus">True</property>
             <property name="can_default">True</property>
             <property name="has_default">True</property>
             <property name="receives_default">True</property>
+            <property name="use_underline">True</property>
           </object>
           <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>
       </object>
@@ -275,7 +232,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">2</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
   </object>
diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
index 439a754..2ef9f3d 100644
--- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="shotwell">
   <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="content">
+      <object class="GtkBox" id="content">
         <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="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">start</property>
             <property name="hexpand">True</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>
@@ -29,60 +29,63 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="field_table">
+          <object class="GtkGrid" 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>
+            <property name="column_spacing">8</property>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</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="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</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>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">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">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="vexpand">False</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>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</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="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
           </object>
@@ -95,12 +98,11 @@
         <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="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -110,7 +112,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
index 374ca65..28011f1 100644
--- a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="rajce_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -36,7 +37,6 @@
         <child>
           <object class="GtkButton" id="logout_button">
             <property name="label" translatable="yes">_Logout</property>
-            <property name="use_action_appearance">False</property>
             <property name="width_request">64</property>
             <property name="height_request">24</property>
             <property name="visible">True</property>
@@ -45,7 +45,6 @@
             <property name="valign">center</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -82,14 +81,10 @@
                 <property name="width_request">320</property>
                 <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>
@@ -102,23 +97,18 @@
               <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>
               <object class="GtkRadioButton" id="use_existing_radio">
                 <property name="label" translatable="yes">An _existing album:</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="halign">start</property>
                 <property name="margin_left">4</property>
                 <property name="margin_right">4</property>
-                <property name="use_action_appearance">False</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">create_new_radio</property>
@@ -126,86 +116,69 @@
               <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="GtkRadioButton" id="create_new_radio">
                 <property name="label" translatable="yes">A _new album named:</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="halign">start</property>
                 <property name="margin_left">4</property>
                 <property name="margin_right">4</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0.47999998927116394</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">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>
               <object class="GtkCheckButton" id="hide_check">
                 <property name="label" translatable="yes">_Hide album</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_action_appearance">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">1</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="show_check">
                 <property name="label" translatable="yes">Open target _album in browser</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_action_appearance">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">1</property>
                 <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="publish_to_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="margin_top">4</property>
                 <property name="margin_bottom">8</property>
-                <property name="xalign">0</property>
                 <property name="label">$mediatype will appear in</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -245,7 +218,6 @@
         <child>
           <object class="GtkButton" id="publish_button">
             <property name="label" translatable="yes">_Publish</property>
-            <property name="use_action_appearance">False</property>
             <property name="width_request">96</property>
             <property name="height_request">30</property>
             <property name="visible">True</property>
@@ -255,7 +227,6 @@
             <property name="valign">center</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index 53262a3..6b17a54 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing-extras.c generated by valac 0.32.1, the Vala compiler
+/* shotwell-publishing-extras.c generated by valac 0.34.4, the Vala compiler
  * generated from shotwell-publishing-extras.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 9752a7c..24a647f 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
-  <requires lib="gtk+" version="3.0"/>
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="content">
+      <object class="GtkBox" id="content">
         <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="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">start</property>
             <property name="hexpand">True</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>
@@ -29,60 +29,63 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="field_table">
+          <object class="GtkGrid" 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>
+            <property name="column_spacing">8</property>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</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="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</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>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">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">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="vexpand">False</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>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</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="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
           </object>
@@ -93,7 +96,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
index ac201da..acc5459 100644
--- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="tumblr_pane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -16,7 +17,7 @@
           <object class="GtkLabel" id="upload_info_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="no">You are logged into Tumblr as (name).
+            <property name="label">You are logged into Tumblr as (name).
 
 (this label's string is populated and set inside the code,
 so changes made here will not display)</property>
@@ -48,15 +49,13 @@ so changes made here will not display)</property>
               <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="size_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">Photo _size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">size_combo</property>
@@ -64,36 +63,26 @@ so changes made here will not display)</property>
               <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="GtkComboBoxText" id="blog_combo">
                 <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">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="size_combo">
                 <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>
           </object>
@@ -114,12 +103,10 @@ so changes made here will not display)</property>
             <child>
               <object class="GtkButton" id="logout_button">
                 <property name="label" translatable="yes">_Logout</property>
-                <property name="use_action_appearance">False</property>
                 <property name="width_request">96</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>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -132,12 +119,10 @@ so changes made here will not display)</property>
             <child>
               <object class="GtkButton" id="publish_button">
                 <property name="label" translatable="yes">_Publish</property>
-                <property name="use_action_appearance">False</property>
                 <property name="width_request">96</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>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
index 1d9cc22..e1cc54d 100644
--- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui
+++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
@@ -28,15 +28,18 @@
   <object class="GtkWindow" id="publish_options_window">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="content">
+      <object class="GtkBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" 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="GtkLabel" id="label2">
                 <property name="visible">True</property>
@@ -44,25 +47,13 @@
                 <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="left_attach">0</property>
                 <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="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="GtkComboBoxText" id="access_type_list">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -70,8 +61,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_padding">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -82,10 +72,23 @@
               </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>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">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>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
@@ -104,8 +107,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.30000001192092896</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -121,8 +124,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.30000001192092896</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -132,7 +135,7 @@
           </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="spacing">2</property>
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index 40b85b5..de24060 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -1,4 +1,4 @@
-/* FacebookPublishing.c generated by valac 0.32.1, the Vala compiler
+/* FacebookPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from FacebookPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3460,35 +3460,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 3465 "FacebookPublishing.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3473 "FacebookPublishing.c"
 	} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3479 "FacebookPublishing.c"
 	}
@@ -3512,103 +3512,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 3513 "FacebookPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 3522 "FacebookPublishing.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 3528 "FacebookPublishing.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 3537 "FacebookPublishing.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 3543 "FacebookPublishing.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 3552 "FacebookPublishing.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 3556 "FacebookPublishing.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 3564 "FacebookPublishing.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 3573 "FacebookPublishing.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 3577 "FacebookPublishing.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3599 "FacebookPublishing.c"
 }
@@ -3621,33 +3621,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 3624 "FacebookPublishing.c"
 		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3632 "FacebookPublishing.c"
 	} else {
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3638 "FacebookPublishing.c"
 	}
@@ -3657,11 +3657,11 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 3652 "FacebookPublishing.c"
 	{
@@ -3676,73 +3676,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3683 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3692 "FacebookPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3708 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3719 "FacebookPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3733 "FacebookPublishing.c"
 	}
@@ -3750,24 +3750,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch4_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 3747 "FacebookPublishing.c"
 	}
 	__finally4:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 3758 "FacebookPublishing.c"
 	}
@@ -5366,17 +5366,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 5348 "FacebookPublishing.c"
 }
@@ -9919,13 +9919,13 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_
 static gchar* g_date_time_to_string (GDateTime* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 2785 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2834 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z");
-#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp0_;
-#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 9895 "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_with_owner (_tmp34_, _tmp34__length1, self, NULL);
+	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
 #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 8c5222a..3fafe37 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();
             
-            var image_data = new Soup.Buffer.with_owner (payload, this, null);
+            Soup.Buffer image_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, payload);
             
             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.Status.IO_ERROR ||
-            msg.status_code == Soup.Status.MALFORMED ||
-            msg.status_code == Soup.Status.TRY_AGAIN) {
+        if (msg.status_code == Soup.KnownStatusCode.IO_ERROR ||
+            msg.status_code == Soup.KnownStatusCode.MALFORMED ||
+            msg.status_code == Soup.KnownStatusCode.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.Status.OK:
-            case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
+            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
             break;
@@ -1471,14 +1471,14 @@ internal class GraphSession {
                     "OAuth Access Token has Expired. Logout user.");
             break;
             
-            case Soup.Status.CANT_RESOLVE:
-            case Soup.Status.CANT_RESOLVE_PROXY:
+            case Soup.KnownStatusCode.CANT_RESOLVE:
+            case Soup.KnownStatusCode.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.Status.CANT_CONNECT:
-            case Soup.Status.CANT_CONNECT_PROXY:
+            case Soup.KnownStatusCode.CANT_CONNECT:
+            case Soup.KnownStatusCode.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 5ce38bd..f0a92e8 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -1,4 +1,4 @@
-/* FlickrPublishing.c generated by valac 0.32.1, the Vala compiler
+/* FlickrPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from FlickrPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,10 +18,10 @@
 #include <glib/gi18n-lib.h>
 #include <float.h>
 #include <math.h>
+#include <libsoup/soup.h>
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <gee.h>
-#include <libsoup/soup.h>
 #include <gexiv2/gexiv2.h>
 #include <gobject/gvaluecollector.h>
 
@@ -130,6 +130,7 @@ typedef struct _PublishingFlickrAuthenticationRequestTransaction PublishingFlick
 typedef struct _PublishingFlickrAuthenticationRequestTransactionClass PublishingFlickrAuthenticationRequestTransactionClass;
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
 #define PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_flickr_access_token_fetch_transaction_get_type ())
 #define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransaction))
@@ -180,7 +181,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFli
 typedef struct _PublishingFlickrUploadTransaction PublishingFlickrUploadTransaction;
 typedef struct _PublishingFlickrUploadTransactionClass PublishingFlickrUploadTransactionClass;
 typedef struct _PublishingFlickrUploadTransactionPrivate PublishingFlickrUploadTransactionPrivate;
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 typedef struct _PublishingFlickrSessionPrivate PublishingFlickrSessionPrivate;
 #define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPanePrivate PublishingFlickrPublishingOptionsPanePrivate;
@@ -253,7 +253,7 @@ struct _PublishingFlickrPublishingParameters {
 	volatile int ref_count;
 	PublishingFlickrPublishingParametersPrivate * priv;
 	PublishingFlickrUserKind user_kind;
-	gint quota_free_mb;
+	gint64 quota_free_bytes;
 	gint photo_major_axis_size;
 	gchar* username;
 	PublishingFlickrVisibilitySpecification* visibility_specification;
@@ -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_dup8 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup7 (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_dup9 (PublishingRESTSupportArgument** self, int length);
+static PublishingRESTSupportArgument** _vala_array_dup8 (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_dup8 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup7 (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_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_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"
@@ -2843,18 +2843,19 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req
 	const gchar* _tmp0_ = NULL;
 	gchar* oauth_token = NULL;
 	gchar* oauth_token_secret = NULL;
-	gchar** key_value_pairs = NULL;
+	GHashTable* data = NULL;
 	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint key_value_pairs_length1 = 0;
-	gint _key_value_pairs_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp16_ = NULL;
+	const gchar* _tmp17_ = NULL;
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2871,199 +2872,78 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = response;
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0);
+	_tmp2_ = soup_form_decode (_tmp1_);
 #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs = _tmp3_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs_length1 = _vala_array_length (_tmp2_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_key_value_pairs_size_ = key_value_pairs_length1;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = key_value_pairs;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4__length1 = key_value_pairs_length1;
-#line 2862 "FlickrPublishing.c"
-	{
-		gchar** pair_collection = NULL;
-		gint pair_collection_length1 = 0;
-		gint _pair_collection_size_ = 0;
-		gint pair_it = 0;
+	data = _tmp2_;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		pair_collection = _tmp4_;
+	_tmp3_ = data;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		pair_collection_length1 = _tmp4__length1;
+	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) {
-#line 2874 "FlickrPublishing.c"
-			gchar* _tmp5_ = NULL;
-			gchar* pair = NULL;
+	_g_free0 (oauth_token);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp5_ = g_strdup (pair_collection[pair_it]);
+	_tmp5_ = g_strdup (_tmp4_);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			pair = _tmp5_;
-#line 2881 "FlickrPublishing.c"
-			{
-				gchar** split_pair = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar** _tmp7_ = NULL;
-				gchar** _tmp8_ = NULL;
-				gint split_pair_length1 = 0;
-				gint _split_pair_size_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				const gchar* _tmp15_ = NULL;
+	oauth_token = _tmp5_;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6_ = pair;
+	_tmp6_ = data;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0);
+	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair = _tmp8_;
+	_g_free0 (oauth_token_secret);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair_length1 = _vala_array_length (_tmp7_);
+	_tmp8_ = g_strdup (_tmp7_);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_split_pair_size_ = split_pair_length1;
+	oauth_token_secret = _tmp8_;
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = oauth_token;
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9_ = split_pair;
+	if (_tmp10_ == NULL) {
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9__length1 = split_pair_length1;
+		_tmp9_ = TRUE;
+#line 2881 "FlickrPublishing.c"
+	} else {
+		const gchar* _tmp11_ = NULL;
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp9__length1 != 2) {
-#line 2910 "FlickrPublishing.c"
-					SpitPublishingPluginHost* _tmp10_ = NULL;
-					const gchar* _tmp11_ = NULL;
-					GError* _tmp12_ = NULL;
-					GError* _tmp13_ = NULL;
+		_tmp11_ = oauth_token_secret;
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp9_ = _tmp11_ == NULL;
+#line 2888 "FlickrPublishing.c"
+	}
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp9_) {
+#line 2892 "FlickrPublishing.c"
+		SpitPublishingPluginHost* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+		GError* _tmp14_ = NULL;
+		GError* _tmp15_ = NULL;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp10_ = self->priv->host;
+		_tmp12_ = self->priv->host;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp11_ = response;
+		_tmp13_ = response;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp11_);
+		_tmp14_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp13_);
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp13_ = _tmp12_;
+		_tmp15_ = _tmp14_;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
+		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_error_free0 (_tmp13_);
-#line 2927 "FlickrPublishing.c"
-				}
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14_ = split_pair;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14__length1 = split_pair_length1;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp15_ = _tmp14_[0];
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (g_strcmp0 (_tmp15_, "oauth_token") == 0) {
-#line 2937 "FlickrPublishing.c"
-					gchar** _tmp16_ = NULL;
-					gint _tmp16__length1 = 0;
-					const gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp16_ = split_pair;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp16__length1 = split_pair_length1;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17_ = _tmp16_[1];
+		_g_error_free0 (_tmp15_);
+#line 2909 "FlickrPublishing.c"
+	}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp18_ = g_strdup (_tmp17_);
+	_tmp16_ = oauth_token;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (oauth_token);
+	_tmp17_ = oauth_token_secret;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					oauth_token = _tmp18_;
-#line 2954 "FlickrPublishing.c"
-				} else {
-					gchar** _tmp19_ = NULL;
-					gint _tmp19__length1 = 0;
-					const gchar* _tmp20_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp19_ = split_pair;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp19__length1 = split_pair_length1;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp20_ = _tmp19_[0];
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) {
-#line 2967 "FlickrPublishing.c"
-						gchar** _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
-						const gchar* _tmp22_ = NULL;
-						gchar* _tmp23_ = NULL;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp21_ = split_pair;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp21__length1 = split_pair_length1;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp22_ = _tmp21_[1];
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp23_ = g_strdup (_tmp22_);
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_g_free0 (oauth_token_secret);
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						oauth_token_secret = _tmp23_;
-#line 2984 "FlickrPublishing.c"
-					}
-				}
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (pair);
-#line 2991 "FlickrPublishing.c"
-			}
-		}
-	}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = oauth_token;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp25_ == NULL) {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp24_ = TRUE;
-#line 3001 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp26_ = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp26_ = oauth_token_secret;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp24_ = _tmp26_ == NULL;
-#line 3008 "FlickrPublishing.c"
-	}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp24_) {
-#line 3012 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GError* _tmp29_ = NULL;
-		GError* _tmp30_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp27_ = self->priv->host;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp28_ = response;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp28_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp30_ = _tmp29_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp30_);
-#line 3029 "FlickrPublishing.c"
-	}
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp31_ = oauth_token;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = oauth_token_secret;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp31_, _tmp32_);
+	publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp16_, _tmp17_);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
+	_g_hash_table_unref0 (data);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (oauth_token_secret);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (oauth_token);
-#line 3043 "FlickrPublishing.c"
+#line 2923 "FlickrPublishing.c"
 }
 
 
@@ -3076,60 +2956,60 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strconcat ("https://www.flickr.com/services/oauth/authorize?oauth_token=", _tmp0_, NULL);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strconcat (_tmp2_, "&perms=write", NULL);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	login_uri = _tmp4_;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = login_uri;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:419: ACTION: launching system browser with uri =" \
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:409: ACTION: launching system browser with uri =" \
 " '%s'", _tmp5_);
-#line 3078 "FlickrPublishing.c"
+#line 2958 "FlickrPublishing.c"
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = login_uri;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_spawn_command_line_async (_tmp8_, &_inner_error_);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 3097 "FlickrPublishing.c"
+#line 2977 "FlickrPublishing.c"
 				goto __catch17_g_spawn_error;
 			}
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (login_uri);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3108 "FlickrPublishing.c"
+#line 2988 "FlickrPublishing.c"
 		}
 	}
 	goto __finally17;
@@ -3139,46 +3019,46 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish
 		SpitPublishingPluginHost* _tmp9_ = NULL;
 		GError* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = self->priv->host;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "couldn't launch system web browser to complete Flickr login");
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp9_, _tmp11_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp11_);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (login_uri);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3138 "FlickrPublishing.c"
+#line 3018 "FlickrPublishing.c"
 	}
 	__finally17:
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (login_uri);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3151 "FlickrPublishing.c"
+#line 3031 "FlickrPublishing.c"
 	}
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_system_browser_launched (self);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (login_uri);
-#line 3157 "FlickrPublishing.c"
+#line 3037 "FlickrPublishing.c"
 }
 
 
@@ -3192,24 +3072,24 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin
 	SpitPublishingPluginHost* _tmp11_ = NULL;
 	PublishingFlickrPinEntryPane* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:433: ACTION: showing PIN entry pane");
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:423: ACTION: showing PIN entry pane");
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp0_;
-#line 3179 "FlickrPublishing.c"
+#line 3059 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = builder;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3188 "FlickrPublishing.c"
+#line 3068 "FlickrPublishing.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -3223,71 +3103,71 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = e;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp2_->message;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:441: Could not parse UI file! Error: %s.", _tmp3_);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:431: Could not parse UI file! Error: %s.", _tmp3_);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue.");
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3230 "FlickrPublishing.c"
+#line 3110 "FlickrPublishing.c"
 	}
 	__finally18:
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3243 "FlickrPublishing.c"
+#line 3123 "FlickrPublishing.c"
 	}
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = builder;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = publishing_flickr_pin_entry_pane_new (_tmp8_);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	pin_entry_pane = _tmp9_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = pin_entry_pane;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self, 0);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = self->priv->host;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = pin_entry_pane;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (pin_entry_pane);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3265 "FlickrPublishing.c"
+#line 3145 "FlickrPublishing.c"
 }
 
 
@@ -3301,56 +3181,56 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl
 	const gchar* _tmp5_ = NULL;
 	PublishingFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (pin != NULL);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = pin;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:454: ACTION: validating authorization PIN %s", _tmp0_);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:444: ACTION: validating authorization PIN %s", _tmp0_);
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _ ("Verifying authorization…");
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = pin;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp6_;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3309 "FlickrPublishing.c"
+#line 3189 "FlickrPublishing.c"
 	{
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3317 "FlickrPublishing.c"
+#line 3197 "FlickrPublishing.c"
 				goto __catch19_spit_publishing_publishing_error;
 			}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3328 "FlickrPublishing.c"
+#line 3208 "FlickrPublishing.c"
 		}
 	}
 	goto __finally19;
@@ -3359,317 +3239,192 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = self->priv->host;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = err;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 3349 "FlickrPublishing.c"
+#line 3229 "FlickrPublishing.c"
 	}
 	__finally19:
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3362 "FlickrPublishing.c"
+#line 3242 "FlickrPublishing.c"
 	}
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3366 "FlickrPublishing.c"
+#line 3246 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response) {
 	const gchar* _tmp0_ = NULL;
-	gchar** key_value_pairs = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint key_value_pairs_length1 = 0;
-	gint _key_value_pairs_size_ = 0;
 	gchar* token = NULL;
 	gchar* token_secret = NULL;
 	gchar* username = NULL;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	GHashTable* data = NULL;
+	const gchar* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	GHashTable* _tmp9_ = NULL;
+	gconstpointer _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp16_ = FALSE;
+	const gchar* _tmp17_ = NULL;
+	PublishingFlickrSession* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
 	const gchar* _tmp25_ = NULL;
 	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	const gchar* _tmp30_ = NULL;
-	PublishingFlickrSession* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (response != NULL);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = response;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:471: ACTION: extracting access phase credentials" \
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:461: ACTION: extracting access phase credentials" \
 " from '%s'", _tmp0_);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = response;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs = _tmp3_;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs_length1 = _vala_array_length (_tmp2_);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_key_value_pairs_size_ = key_value_pairs_length1;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	token = NULL;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	token_secret = NULL;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	username = NULL;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = key_value_pairs;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4__length1 = key_value_pairs_length1;
-#line 3421 "FlickrPublishing.c"
-	{
-		gchar** key_value_pair_collection = NULL;
-		gint key_value_pair_collection_length1 = 0;
-		gint _key_value_pair_collection_size_ = 0;
-		gint key_value_pair_it = 0;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		key_value_pair_collection = _tmp4_;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		key_value_pair_collection_length1 = _tmp4__length1;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		for (key_value_pair_it = 0; key_value_pair_it < _tmp4__length1; key_value_pair_it = key_value_pair_it + 1) {
-#line 3433 "FlickrPublishing.c"
-			gchar* _tmp5_ = NULL;
-			gchar* key_value_pair = NULL;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp5_ = g_strdup (key_value_pair_collection[key_value_pair_it]);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			key_value_pair = _tmp5_;
-#line 3440 "FlickrPublishing.c"
-			{
-				gchar** split_pair = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar** _tmp7_ = NULL;
-				gchar** _tmp8_ = NULL;
-				gint split_pair_length1 = 0;
-				gint _split_pair_size_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar* key = NULL;
-				gchar** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gchar* value = NULL;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				const gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6_ = key_value_pair;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair = _tmp8_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair_length1 = _vala_array_length (_tmp7_);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_split_pair_size_ = split_pair_length1;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9_ = split_pair;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9__length1 = split_pair_length1;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp9__length1 != 2) {
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (key_value_pair);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					continue;
-#line 3483 "FlickrPublishing.c"
-				}
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp10_ = split_pair;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp10__length1 = split_pair_length1;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp11_ = _tmp10_[0];
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp12_ = g_strdup (_tmp11_);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				key = _tmp12_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp13_ = split_pair;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp13__length1 = split_pair_length1;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14_ = _tmp13_[1];
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp15_ = g_strdup (_tmp14_);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				value = _tmp15_;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = key;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (g_strcmp0 (_tmp16_, "oauth_token") == 0) {
-#line 3509 "FlickrPublishing.c"
-					const gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17_ = value;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp18_ = g_strdup (_tmp17_);
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (token);
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					token = _tmp18_;
-#line 3520 "FlickrPublishing.c"
-				} else {
-					const gchar* _tmp19_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp19_ = key;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					if (g_strcmp0 (_tmp19_, "oauth_token_secret") == 0) {
-#line 3527 "FlickrPublishing.c"
-						const gchar* _tmp20_ = NULL;
-						gchar* _tmp21_ = NULL;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp20_ = value;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp21_ = g_strdup (_tmp20_);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_g_free0 (token_secret);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						token_secret = _tmp21_;
-#line 3538 "FlickrPublishing.c"
-					} else {
-						const gchar* _tmp22_ = NULL;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp22_ = key;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						if (g_strcmp0 (_tmp22_, "username") == 0) {
-#line 3545 "FlickrPublishing.c"
-							const gchar* _tmp23_ = NULL;
-							gchar* _tmp24_ = NULL;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-							_tmp23_ = value;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-							_tmp24_ = g_strdup (_tmp23_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-							_g_free0 (username);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-							username = _tmp24_;
-#line 3556 "FlickrPublishing.c"
-						}
-					}
-				}
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (value);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (key);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (key_value_pair);
-#line 3568 "FlickrPublishing.c"
-			}
-		}
-	}
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = token;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = token_secret;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp27_ = username;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:495: access phase credentials: { token = '%s'; t" \
-"oken_secret = '%s'; username = '%s' }", _tmp25_, _tmp26_, _tmp27_);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp30_ = token;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp30_ == NULL) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp29_ = TRUE;
-#line 3586 "FlickrPublishing.c"
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = response;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = soup_form_decode (_tmp1_);
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	data = _tmp2_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = data;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (token);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	token = _tmp5_;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = data;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (token_secret);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = g_strdup (_tmp7_);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	token_secret = _tmp8_;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = data;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (username);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = g_strdup (_tmp10_);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	username = _tmp11_;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = token;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = token_secret;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = username;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:472: access phase credentials: { token = '%s'; t" \
+"oken_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = token;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp17_ == NULL) {
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp16_ = TRUE;
+#line 3341 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp31_ = NULL;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp31_ = token_secret;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp29_ = _tmp31_ == NULL;
-#line 3593 "FlickrPublishing.c"
-	}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp29_) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp28_ = TRUE;
-#line 3599 "FlickrPublishing.c"
+		const gchar* _tmp18_ = NULL;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp18_ = token_secret;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp16_ = _tmp18_ == NULL;
+#line 3348 "FlickrPublishing.c"
+	}
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp16_) {
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp15_ = TRUE;
+#line 3354 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp32_ = NULL;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp32_ = username;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp28_ = _tmp32_ == NULL;
-#line 3606 "FlickrPublishing.c"
-	}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp28_) {
-#line 3610 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp33_ = NULL;
-		GError* _tmp34_ = NULL;
-		GError* _tmp35_ = NULL;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp33_ = self->priv->host;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp34_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
-"but at " "least one of these is absent");
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp35_ = _tmp34_;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp33_, _tmp35_);
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp35_);
-#line 3624 "FlickrPublishing.c"
+		const gchar* _tmp19_ = NULL;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp19_ = username;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp15_ = _tmp19_ == NULL;
+#line 3361 "FlickrPublishing.c"
 	}
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp36_ = self->priv->session;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = token;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp38_ = token_secret;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp39_ = username;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_access_phase_credentials (_tmp36_, _tmp37_, _tmp38_, _tmp39_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp15_) {
+#line 3365 "FlickrPublishing.c"
+		SpitPublishingPluginHost* _tmp20_ = NULL;
+		GError* _tmp21_ = NULL;
+		GError* _tmp22_ = NULL;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp20_ = self->priv->host;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
+"but at " "least one of these is absent");
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp22_ = _tmp21_;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_error_free0 (_tmp22_);
+#line 3379 "FlickrPublishing.c"
+	}
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = self->priv->session;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = token;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = token_secret;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp26_ = username;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_hash_table_unref0 (data);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (username);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (token_secret);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (token);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
-#line 3644 "FlickrPublishing.c"
+#line 3399 "FlickrPublishing.c"
 }
 
 
@@ -3680,49 +3435,49 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 	PublishingFlickrSession* _tmp2_ = NULL;
 	PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:507: ACTION: running network transaction to fetc" \
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:484: ACTION: running network transaction to fetc" \
 "h account information");
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp3_;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3677 "FlickrPublishing.c"
+#line 3432 "FlickrPublishing.c"
 	{
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3685 "FlickrPublishing.c"
+#line 3440 "FlickrPublishing.c"
 				goto __catch20_spit_publishing_publishing_error;
 			}
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3696 "FlickrPublishing.c"
+#line 3451 "FlickrPublishing.c"
 		}
 	}
 	goto __finally20;
@@ -3731,52 +3486,70 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = err;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 3717 "FlickrPublishing.c"
+#line 3472 "FlickrPublishing.c"
 	}
 	__finally20:
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3730 "FlickrPublishing.c"
+#line 3485 "FlickrPublishing.c"
 	}
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3734 "FlickrPublishing.c"
+#line 3489 "FlickrPublishing.c"
+}
+
+
+static gint64 int64_parse (const gchar* str) {
+	gint64 result = 0LL;
+	const gchar* _tmp0_ = NULL;
+	gint64 _tmp1_ = 0LL;
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (str != NULL, 0LL);
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp1_;
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 3507 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
 	const gchar* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (xml != NULL);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = xml;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:524: ACTION: parsing account information from xm" \
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:501: ACTION: parsing account information from xm" \
 "l = '%s'", _tmp0_);
-#line 3749 "FlickrPublishing.c"
+#line 3522 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3802,229 +3575,229 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		gchar* _tmp16_ = NULL;
 		PublishingFlickrUserKind user_kind = 0;
 		const gchar* _tmp17_ = NULL;
-		gint quota_mb_left = 0;
+		gint64 quota_bytes_left = 0LL;
 		const gchar* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
+		gint64 _tmp21_ = 0LL;
 		PublishingFlickrPublishingParameters* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
+		gint64 _tmp23_ = 0LL;
 		PublishingFlickrPublishingParameters* _tmp24_ = NULL;
 		PublishingFlickrUserKind _tmp25_ = 0;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		response_doc = _tmp2_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3792 "FlickrPublishing.c"
+#line 3565 "FlickrPublishing.c"
 				goto __catch21_spit_publishing_publishing_error;
 			}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3801 "FlickrPublishing.c"
+#line 3574 "FlickrPublishing.c"
 		}
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		root_node = _tmp4_;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = response_doc;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = root_node;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		user_node = _tmp7_;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3823 "FlickrPublishing.c"
+#line 3596 "FlickrPublishing.c"
 				goto __catch21_spit_publishing_publishing_error;
 			}
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3834 "FlickrPublishing.c"
+#line 3607 "FlickrPublishing.c"
 		}
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = response_doc;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = user_node;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		is_pro_str = _tmp10_;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3850 "FlickrPublishing.c"
+#line 3623 "FlickrPublishing.c"
 				goto __catch21_spit_publishing_publishing_error;
 			}
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3861 "FlickrPublishing.c"
+#line 3634 "FlickrPublishing.c"
 		}
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = response_doc;
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = user_node;
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		bandwidth_node = _tmp13_;
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3879 "FlickrPublishing.c"
+#line 3652 "FlickrPublishing.c"
 				goto __catch21_spit_publishing_publishing_error;
 			}
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3892 "FlickrPublishing.c"
+#line 3665 "FlickrPublishing.c"
 		}
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = response_doc;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = bandwidth_node;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		remaining_kb_str = _tmp16_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3910 "FlickrPublishing.c"
+#line 3683 "FlickrPublishing.c"
 				goto __catch21_spit_publishing_publishing_error;
 			}
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3923 "FlickrPublishing.c"
+#line 3696 "FlickrPublishing.c"
 		}
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp17_ = is_pro_str;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_strcmp0 (_tmp17_, "0") == 0) {
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 3931 "FlickrPublishing.c"
+#line 3704 "FlickrPublishing.c"
 		} else {
 			const gchar* _tmp18_ = NULL;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp18_ = is_pro_str;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (g_strcmp0 (_tmp18_, "1") == 0) {
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 3940 "FlickrPublishing.c"
+#line 3713 "FlickrPublishing.c"
 			} else {
 				GError* _tmp19_ = NULL;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account");
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_inner_error_ = _tmp19_;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3955 "FlickrPublishing.c"
+#line 3728 "FlickrPublishing.c"
 					goto __catch21_spit_publishing_publishing_error;
 				}
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 3970 "FlickrPublishing.c"
+#line 3743 "FlickrPublishing.c"
 			}
 		}
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = remaining_kb_str;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp21_ = atoi (_tmp20_);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		quota_mb_left = _tmp21_ / 1024;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp21_ = int64_parse (_tmp20_);
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		quota_bytes_left = _tmp21_ * 1024;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = self->priv->parameters;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp23_ = quota_mb_left;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_->quota_free_mb = _tmp23_;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp23_ = quota_bytes_left;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp22_->quota_free_bytes = _tmp23_;
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_ = self->priv->parameters;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp25_ = user_kind;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_->user_kind = _tmp25_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (remaining_kb_str);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (is_pro_str);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 3997 "FlickrPublishing.c"
+#line 3770 "FlickrPublishing.c"
 	}
 	goto __finally21;
 	__catch21_spit_publishing_publishing_error:
@@ -4033,69 +3806,69 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		GError* _tmp26_ = NULL;
 		SpitPublishingPluginHost* _tmp27_ = NULL;
 		GError* _tmp28_ = NULL;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = err;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_error_matches (_tmp26_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			publishing_flickr_flickr_publisher_do_logout (self);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4020 "FlickrPublishing.c"
+#line 3793 "FlickrPublishing.c"
 		}
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = self->priv->host;
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = err;
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4032 "FlickrPublishing.c"
+#line 3805 "FlickrPublishing.c"
 	}
 	__finally21:
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4043 "FlickrPublishing.c"
+#line 3816 "FlickrPublishing.c"
 	}
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 4047 "FlickrPublishing.c"
+#line 3820 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
 	PublishingFlickrSession* _tmp0_ = NULL;
-#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:568: ACTION: logging user out, deauthenticating " \
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:545: ACTION: logging user out, deauthenticating " \
 "session, and erasing stored credentials");
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_deauthenticate (_tmp0_);
-#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_invalidate_persistent_session (self);
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 4067 "FlickrPublishing.c"
+#line 3840 "FlickrPublishing.c"
 }
 
 
@@ -4114,28 +3887,28 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp17_ = NULL;
 	PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:579: ACTION: displaying publishing options pane");
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:556: ACTION: displaying publishing options pane");
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 4098 "FlickrPublishing.c"
+#line 3871 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4107 "FlickrPublishing.c"
+#line 3880 "FlickrPublishing.c"
 			goto __catch22_g_error;
 		}
 	}
@@ -4149,83 +3922,83 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = e;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = _tmp3_->message;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:591: Could not parse UI file! Error: %s.", _tmp4_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:568: Could not parse UI file! Error: %s.", _tmp4_);
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue.");
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp8_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4149 "FlickrPublishing.c"
+#line 3922 "FlickrPublishing.c"
 	}
 	__finally22:
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4162 "FlickrPublishing.c"
+#line 3935 "FlickrPublishing.c"
 	}
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->parameters;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = builder;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = _tmp14_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = self->priv->publishing_options_pane;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->publishing_options_pane;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = self->priv->host;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = self->priv->publishing_options_pane;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 4196 "FlickrPublishing.c"
+#line 3969 "FlickrPublishing.c"
 }
 
 
@@ -4239,51 +4012,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli
 	GDateTime* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = a;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = b;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp2_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp7_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4238 "FlickrPublishing.c"
+#line 4011 "FlickrPublishing.c"
 }
 
 
 static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = publishing_flickr_flickr_publisher_flickr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4247 "FlickrPublishing.c"
+#line 4020 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 4254 "FlickrPublishing.c"
+#line 4027 "FlickrPublishing.c"
 }
 
 
@@ -4323,168 +4096,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 	PublishingFlickrUploader* _tmp28_ = NULL;
 	PublishingFlickrUploader* _tmp29_ = NULL;
 	PublishingFlickrUploader* _tmp30_ = NULL;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:612: ACTION: uploading media items to remote ser" \
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:589: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->parameters;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_->photo_major_axis_size;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp9_) {
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4336 "FlickrPublishing.c"
+#line 4109 "FlickrPublishing.c"
 	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = _tmp12_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_list = _tmp13_;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishables;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 4356 "FlickrPublishing.c"
+#line 4129 "FlickrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection = _tmp14_;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection_length1 = _tmp14__length1;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 4368 "FlickrPublishing.c"
+#line 4141 "FlickrPublishing.c"
 			SpitPublishingPublishable* _tmp15_ = NULL;
 			SpitPublishingPublishable* p = NULL;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			p = _tmp15_;
-#line 4375 "FlickrPublishing.c"
+#line 4148 "FlickrPublishing.c"
 			{
 				GeeArrayList* _tmp16_ = NULL;
 				SpitPublishingPublishable* _tmp17_ = NULL;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = sorted_list;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = p;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_object_unref0 (p);
-#line 4387 "FlickrPublishing.c"
+#line 4160 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = sorted_list;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->session;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = sorted_list;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp21_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23__length1 = _tmp21_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = self->priv->parameters;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = strip_metadata;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	uploader = _tmp27_;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = uploader;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = uploader;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = uploader;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (sorted_list);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4435 "FlickrPublishing.c"
+#line 4208 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:640: ACTION: showing success pane.");
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:617: ACTION: showing success pane.");
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4454 "FlickrPublishing.c"
+#line 4227 "FlickrPublishing.c"
 }
 
 
@@ -4492,32 +4265,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4472 "FlickrPublishing.c"
+#line 4245 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = vis;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", _tmp1_);
-#line 4487 "FlickrPublishing.c"
+#line 4260 "FlickrPublishing.c"
 }
 
 
@@ -4525,32 +4298,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4505 "FlickrPublishing.c"
+#line 4278 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = size;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 4520 "FlickrPublishing.c"
+#line 4293 "FlickrPublishing.c"
 }
 
 
@@ -4559,17 +4332,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4539 "FlickrPublishing.c"
+#line 4312 "FlickrPublishing.c"
 }
 
 
@@ -4577,31 +4350,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4555 "FlickrPublishing.c"
+#line 4328 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = TRUE;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = TRUE;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_flickr_flickr_publisher_is_persistent_session_valid (self);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_) {
-#line 4571 "FlickrPublishing.c"
+#line 4344 "FlickrPublishing.c"
 		PublishingFlickrSession* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -4609,39 +4382,39 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:677: attempt start: a persistent session is avai" \
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:654: attempt start: a persistent session is avai" \
 "lable; using it");
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp3_);
-#line 4603 "FlickrPublishing.c"
+#line 4376 "FlickrPublishing.c"
 	} else {
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:682: attempt start: no persistent session availa" \
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:659: attempt start: no persistent session availa" \
 "ble; showing login welcome pane");
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_flickr_publisher_do_show_login_welcome_pane (self);
-#line 4609 "FlickrPublishing.c"
+#line 4382 "FlickrPublishing.c"
 	}
 }
 
@@ -4650,55 +4423,55 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish
 	PublishingFlickrFlickrPublisher * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_) {
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4626 "FlickrPublishing.c"
+#line 4399 "FlickrPublishing.c"
 	}
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_error ("FlickrPublishing.vala:693: FlickrPublisher: start( ): can't start; thi" \
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_error ("FlickrPublishing.vala:670: FlickrPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4634 "FlickrPublishing.c"
+#line 4407 "FlickrPublishing.c"
 	}
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:695: FlickrPublisher: starting interaction.");
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:672: FlickrPublisher: starting interaction.");
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 4640 "FlickrPublishing.c"
+#line 4413 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
 	PublishingFlickrSession* _tmp0_ = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:701: FlickrPublisher: stop( ) invoked.");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:678: FlickrPublisher: stop( ) invoked.");
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4655 "FlickrPublishing.c"
+#line 4428 "FlickrPublishing.c"
 		PublishingFlickrSession* _tmp1_ = NULL;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 4661 "FlickrPublishing.c"
+#line 4434 "FlickrPublishing.c"
 	}
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 4665 "FlickrPublishing.c"
+#line 4438 "FlickrPublishing.c"
 }
 
 
@@ -4709,7 +4482,7 @@ static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlick
 	g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 4676 "FlickrPublishing.c"
+#line 4449 "FlickrPublishing.c"
 }
 
 
@@ -4724,7 +4497,7 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop;
-#line 4691 "FlickrPublishing.c"
+#line 4464 "FlickrPublishing.c"
 }
 
 
@@ -4743,7 +4516,7 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl
 	self->priv->publishing_options_pane = NULL;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 4710 "FlickrPublishing.c"
+#line 4483 "FlickrPublishing.c"
 }
 
 
@@ -4779,7 +4552,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) {
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 4746 "FlickrPublishing.c"
+#line 4519 "FlickrPublishing.c"
 }
 
 
@@ -4822,115 +4595,115 @@ PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType
 	GObject* _tmp20_ = NULL;
 	GtkBox* _tmp21_ = NULL;
 	GtkBox* _tmp22_ = NULL;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPinEntryPane*) g_object_new (object_type, NULL);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = builder;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = builder;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = builder;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = builder;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "explanatory_text");
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->explanatory_text);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->explanatory_text = _tmp9_;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = builder;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "pin_entry_caption");
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp11_) : NULL);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pin_entry_caption = _tmp12_;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = builder;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = gtk_builder_get_object (_tmp13_, "pin_entry");
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pin_entry);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pin_entry = _tmp15_;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = builder;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "continue_button");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->continue_button);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->continue_button = _tmp18_;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = builder;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = gtk_builder_get_object (_tmp19_, "pane_widget");
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_box_get_type ()) ? ((GtkBox*) _tmp20_) : NULL);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = _tmp21_;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = self->priv->pane_widget;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4875 "FlickrPublishing.c"
+#line 4648 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder) {
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_pin_entry_pane_construct (PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 4882 "FlickrPublishing.c"
+#line 4655 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self) {
 	GtkEntry* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pin_entry;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "proceed", self, _tmp1_);
-#line 4897 "FlickrPublishing.c"
+#line 4670 "FlickrPublishing.c"
 }
 
 
@@ -4939,19 +4712,19 @@ static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (Publ
 	GtkEntry* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->continue_button;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->pin_entry;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 4918 "FlickrPublishing.c"
+#line 4691 "FlickrPublishing.c"
 }
 
 
@@ -4960,44 +4733,44 @@ static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4937 "FlickrPublishing.c"
+#line 4710 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFlickrPinEntryPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4950 "FlickrPublishing.c"
+#line 4723 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_pin_entry_pane_on_continue_clicked ((PublishingFlickrPinEntryPane*) self);
-#line 4957 "FlickrPublishing.c"
+#line 4730 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingFlickrPinEntryPane*) self);
-#line 4964 "FlickrPublishing.c"
+#line 4737 "FlickrPublishing.c"
 }
 
 
@@ -5005,17 +4778,17 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublish
 	PublishingFlickrPinEntryPane * self;
 	GtkButton* _tmp0_ = NULL;
 	GtkEntry* _tmp1_ = NULL;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->continue_button;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp0_, "clicked", (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self, 0);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->pin_entry;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 4982 "FlickrPublishing.c"
+#line 4755 "FlickrPublishing.c"
 }
 
 
@@ -5025,21 +4798,21 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPubli
 	guint _tmp1_ = 0U;
 	GtkEntry* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->continue_button;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->pin_entry;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 5006 "FlickrPublishing.c"
+#line 4779 "FlickrPublishing.c"
 }
 
 
@@ -5050,96 +4823,96 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		data1 = closure->data;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 5025 "FlickrPublishing.c"
+#line 4798 "FlickrPublishing.c"
 	} else {
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		data2 = closure->data;
-#line 5031 "FlickrPublishing.c"
+#line 4804 "FlickrPublishing.c"
 	}
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 5037 "FlickrPublishing.c"
+#line 4810 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_pin_entry_pane_class_init (PublishingFlickrPinEntryPaneClass * klass) {
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_pin_entry_pane_parent_class = g_type_class_peek_parent (klass);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPinEntryPanePrivate));
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_pin_entry_pane_finalize;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 5050 "FlickrPublishing.c"
+#line 4823 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_widget;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_preferred_geometry;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_installed;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 5065 "FlickrPublishing.c"
+#line 4838 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_pin_entry_pane_instance_init (PublishingFlickrPinEntryPane * self) {
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE (self);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->continue_button = NULL;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pin_entry = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pin_entry_caption = NULL;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->explanatory_text = NULL;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = NULL;
-#line 5084 "FlickrPublishing.c"
+#line 4857 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_pin_entry_pane_finalize (GObject* obj) {
 	PublishingFlickrPinEntryPane * self;
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->continue_button);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pin_entry);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->explanatory_text);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 5106 "FlickrPublishing.c"
+#line 4879 "FlickrPublishing.c"
 }
 
 
@@ -5167,52 +4940,52 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje
 	PublishingFlickrSession* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = method;
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = session;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp4_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob");
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = session;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp7_);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5172 "FlickrPublishing.c"
+#line 4945 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 5179 "FlickrPublishing.c"
+#line 4952 "FlickrPublishing.c"
 }
 
 
@@ -5227,56 +5000,56 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G
 	PublishingFlickrSession* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = uri;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = method;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrTransaction*) 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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = session;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob");
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = session;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5236 "FlickrPublishing.c"
+#line 5009 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 5243 "FlickrPublishing.c"
+#line 5016 "FlickrPublishing.c"
 }
 
 
@@ -5285,35 +5058,35 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingFlickrSession* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5272 "FlickrPublishing.c"
+#line 5045 "FlickrPublishing.c"
 		} else {
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5280 "FlickrPublishing.c"
+#line 5053 "FlickrPublishing.c"
 		}
 	}
 }
@@ -5339,152 +5112,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = doc;
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	root = _tmp1_;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = root;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	status = _tmp3_;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = status;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 5324 "FlickrPublishing.c"
+#line 5097 "FlickrPublishing.c"
 		gchar* _tmp5_ = NULL;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp5_;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5334 "FlickrPublishing.c"
+#line 5107 "FlickrPublishing.c"
 	}
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = status;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = NULL;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5346 "FlickrPublishing.c"
+#line 5119 "FlickrPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
 		xmlNode* _tmp9_ = NULL;
 		xmlNode* _tmp10_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = doc;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = root;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5365 "FlickrPublishing.c"
+#line 5138 "FlickrPublishing.c"
 				goto __catch23_spit_publishing_publishing_error;
 			}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (status);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5376 "FlickrPublishing.c"
+#line 5149 "FlickrPublishing.c"
 		}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		errcode = _tmp7_;
-#line 5380 "FlickrPublishing.c"
+#line 5153 "FlickrPublishing.c"
 	}
 	goto __finally23;
 	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp11_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5401 "FlickrPublishing.c"
+#line 5174 "FlickrPublishing.c"
 	}
 	__finally23:
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 5414 "FlickrPublishing.c"
+#line 5187 "FlickrPublishing.c"
 	}
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = errcode;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = errcode;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp19_;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (status);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5442 "FlickrPublishing.c"
+#line 5215 "FlickrPublishing.c"
 }
 
 
 static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_flickr_transaction_validate_xml (doc);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5451 "FlickrPublishing.c"
+#line 5224 "FlickrPublishing.c"
 }
 
 
@@ -5492,26 +5265,26 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5471 "FlickrPublishing.c"
+#line 5244 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 5478 "FlickrPublishing.c"
+#line 5251 "FlickrPublishing.c"
 }
 
 
@@ -5519,50 +5292,50 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 	PublishingRESTSupportXmlDocument* result = NULL;
 	PublishingRESTSupportXmlDocument* _result_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (xml != NULL, NULL);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 5490 "FlickrPublishing.c"
+#line 5263 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		const gchar* _tmp1_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_rest_support_xml_document_parse_string (_tmp1_, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp2_;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5506 "FlickrPublishing.c"
+#line 5279 "FlickrPublishing.c"
 				goto __catch24_spit_publishing_publishing_error;
 			}
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5517 "FlickrPublishing.c"
+#line 5290 "FlickrPublishing.c"
 		}
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp0_;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = NULL;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_result_);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_result_ = _tmp3_;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 5529 "FlickrPublishing.c"
+#line 5302 "FlickrPublishing.c"
 	}
 	goto __finally24;
 	__catch24_spit_publishing_publishing_error:
@@ -5574,98 +5347,98 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		gchar* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = e;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _tmp4_->message;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = string_contains (_tmp5_, _tmp7_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp9_) {
-#line 5561 "FlickrPublishing.c"
+#line 5334 "FlickrPublishing.c"
 			GError* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp10_ = e;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp11_ = _tmp10_->message;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp11_);
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp12_;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5575 "FlickrPublishing.c"
+#line 5348 "FlickrPublishing.c"
 			goto __finally24;
 		} else {
 			GError* _tmp13_ = NULL;
 			GError* _tmp14_ = NULL;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp13_ = e;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp14_;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5588 "FlickrPublishing.c"
+#line 5361 "FlickrPublishing.c"
 			goto __finally24;
 		}
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 5593 "FlickrPublishing.c"
+#line 5366 "FlickrPublishing.c"
 	}
 	__finally24:
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5606 "FlickrPublishing.c"
+#line 5379 "FlickrPublishing.c"
 		} else {
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5616 "FlickrPublishing.c"
+#line 5389 "FlickrPublishing.c"
 		}
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5623 "FlickrPublishing.c"
+#line 5396 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) {
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute;
-#line 5632 "FlickrPublishing.c"
+#line 5405 "FlickrPublishing.c"
 }
 
 
@@ -5688,29 +5461,29 @@ GType publishing_flickr_transaction_get_type (void) {
 PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session) {
 	PublishingFlickrAuthenticationRequestTransaction* self = NULL;
 	PublishingFlickrSession* _tmp0_ = NULL;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrAuthenticationRequestTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5663 "FlickrPublishing.c"
+#line 5436 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session) {
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_authentication_request_transaction_construct (PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 5670 "FlickrPublishing.c"
+#line 5443 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_authentication_request_transaction_class_init (PublishingFlickrAuthenticationRequestTransactionClass * klass) {
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5677 "FlickrPublishing.c"
+#line 5450 "FlickrPublishing.c"
 }
 
 
@@ -5737,45 +5510,45 @@ PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetc
 	PublishingFlickrSession* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (user_verifier != NULL, NULL);
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrAccessTokenFetchTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = user_verifier;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = session;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_session_get_request_phase_token (_tmp2_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5728 "FlickrPublishing.c"
+#line 5501 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier) {
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_access_token_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 5735 "FlickrPublishing.c"
+#line 5508 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_access_token_fetch_transaction_class_init (PublishingFlickrAccessTokenFetchTransactionClass * klass) {
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5742 "FlickrPublishing.c"
+#line 5515 "FlickrPublishing.c"
 }
 
 
@@ -5801,41 +5574,41 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc
 	PublishingFlickrSession* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_flickr_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "flickr.people.getUploadStatus");
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = session;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp3_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5788 "FlickrPublishing.c"
+#line 5561 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session);
-#line 5795 "FlickrPublishing.c"
+#line 5568 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5802 "FlickrPublishing.c"
+#line 5575 "FlickrPublishing.c"
 }
 
 
@@ -5856,23 +5629,23 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 
 
 static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 5825 "FlickrPublishing.c"
+#line 5598 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5832 "FlickrPublishing.c"
+#line 5605 "FlickrPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 5839 "FlickrPublishing.c"
+#line 5612 "FlickrPublishing.c"
 }
 
 
@@ -5928,227 +5701,227 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 	gchar* _tmp48_ = NULL;
 	gchar* _tmp49_ = NULL;
 	GHashTable* _tmp50_ = NULL;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishable;
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, "https://api.flickr.com/services/upload");
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = session;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp5_;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields = _tmp6_;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields_length1 = 0;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = session;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob");
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = session;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_);
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_);
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = session;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_session_get_access_phase_token (_tmp13_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _tmp14_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp15_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp15_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = parameters;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_->visibility_specification;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = _tmp17_->everyone_level;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = g_strdup_printf ("%d", _tmp18_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = _tmp19_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp20_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp20_);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = parameters;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = _tmp21_->visibility_specification;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_->friends_level;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = g_strdup_printf ("%d", _tmp23_);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = _tmp24_;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp25_);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = parameters;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _tmp26_->visibility_specification;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = _tmp27_->family_level;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = g_strdup_printf ("%d", _tmp28_);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = _tmp29_;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp30_);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp30_);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = g_str_hash;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = g_str_equal;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = g_hash_table_new_full (_tmp31_, _tmp32_, _g_free0_, _g_free0_);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	disposition_table = _tmp33_;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp34_ = publishable;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp35_ = spit_publishing_publishable_get_publishing_name (_tmp34_);
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	filename = _tmp35_;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp37_ = filename;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp37_ == NULL) {
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp36_ = TRUE;
-#line 6033 "FlickrPublishing.c"
+#line 5806 "FlickrPublishing.c"
 	} else {
 		const gchar* _tmp38_ = NULL;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38_ = filename;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 6040 "FlickrPublishing.c"
+#line 5813 "FlickrPublishing.c"
 	}
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp36_) {
-#line 6044 "FlickrPublishing.c"
+#line 5817 "FlickrPublishing.c"
 		SpitPublishingPublishable* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp39_ = publishable;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (filename);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		filename = _tmp40_;
-#line 6055 "FlickrPublishing.c"
+#line 5828 "FlickrPublishing.c"
 	}
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp41_ = disposition_table;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp42_ = g_strdup ("filename");
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp43_ = publishable;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp45_ = _tmp44_;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = soup_uri_encode (_tmp45_, NULL);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_insert (_tmp41_, _tmp42_, _tmp46_);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp45_);
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp47_ = disposition_table;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp48_ = g_strdup ("name");
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp49_ = g_strdup ("photo");
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_insert (_tmp47_, _tmp48_, _tmp49_);
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp50_ = disposition_table;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp50_);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (filename);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6091 "FlickrPublishing.c"
+#line 5864 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 6098 "FlickrPublishing.c"
+#line 5871 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 6109 "FlickrPublishing.c"
+#line 5882 "FlickrPublishing.c"
 	}
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6115 "FlickrPublishing.c"
+#line 5888 "FlickrPublishing.c"
 }
 
 
@@ -6158,53 +5931,53 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (key != NULL);
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (value != NULL);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = key;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = value;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add18 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 6143 "FlickrPublishing.c"
+#line 5916 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 6150 "FlickrPublishing.c"
+#line 5923 "FlickrPublishing.c"
 }
 
 
-static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
+static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6161 "FlickrPublishing.c"
+#line 5934 "FlickrPublishing.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 6167 "FlickrPublishing.c"
+#line 5940 "FlickrPublishing.c"
 	}
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6171 "FlickrPublishing.c"
+#line 5944 "FlickrPublishing.c"
 }
 
 
@@ -6216,31 +5989,31 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportArgument** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/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_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 6201 "FlickrPublishing.c"
+#line 5974 "FlickrPublishing.c"
 	}
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6207 "FlickrPublishing.c"
+#line 5980 "FlickrPublishing.c"
 }
 
 
@@ -6248,25 +6021,25 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 6221 "FlickrPublishing.c"
+#line 5994 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 6226 "FlickrPublishing.c"
+#line 5999 "FlickrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp1_ = TRUE;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6233 "FlickrPublishing.c"
+#line 6006 "FlickrPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingRESTSupportArgument** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -6293,115 +6066,115 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 				gint _tmp23_ = 0;
 				PublishingRESTSupportArgument** _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp1_) {
-#line 6262 "FlickrPublishing.c"
+#line 6035 "FlickrPublishing.c"
 					gint _tmp2_ = 0;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp2_ = i;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 6268 "FlickrPublishing.c"
+#line 6041 "FlickrPublishing.c"
 				}
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp1_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp3_ = i;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4_ = self->priv->auth_header_fields;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6282 "FlickrPublishing.c"
+#line 6055 "FlickrPublishing.c"
 				}
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = _result_;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = self->priv->auth_header_fields;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = i;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp9_ = _tmp8_->key;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp10_;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp11_ = _result_;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp12_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp13_ = _result_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14_ = self->priv->auth_header_fields;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp15_ = i;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _tmp14_[_tmp15_];
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = _tmp16_->value;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = _tmp18_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp21_ = _tmp20_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp22_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp21_);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp19_);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp23_ = i;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = self->priv->auth_header_fields;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6348 "FlickrPublishing.c"
+#line 6121 "FlickrPublishing.c"
 					const gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = _result_;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (_result_);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6359 "FlickrPublishing.c"
+#line 6132 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6368 "FlickrPublishing.c"
+#line 6141 "FlickrPublishing.c"
 }
 
 
@@ -6411,85 +6184,85 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
 	gchar* authorization_header = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_sign_transaction (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	authorization_header = _tmp1_;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:937: executing upload transaction: authorization" \
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:914: executing upload transaction: authorization" \
 " header string = '%s'", authorization_header);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", authorization_header);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6404 "FlickrPublishing.c"
+#line 6177 "FlickrPublishing.c"
 		} else {
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6414 "FlickrPublishing.c"
+#line 6187 "FlickrPublishing.c"
 		}
 	}
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (authorization_header);
-#line 6419 "FlickrPublishing.c"
+#line 6192 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute;
-#line 6432 "FlickrPublishing.c"
+#line 6205 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 6439 "FlickrPublishing.c"
+#line 6212 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingFlickrUploadTransaction * self;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 6455 "FlickrPublishing.c"
+#line 6228 "FlickrPublishing.c"
 }
 
 
@@ -6507,18 +6280,18 @@ GType publishing_flickr_upload_transaction_get_type (void) {
 
 PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) {
 	PublishingFlickrSession* self = NULL;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL);
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6477 "FlickrPublishing.c"
+#line 6250 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrSession* publishing_flickr_session_new (void) {
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 6484 "FlickrPublishing.c"
+#line 6257 "FlickrPublishing.c"
 }
 
 
@@ -6528,43 +6301,43 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->access_phase_token;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 6500 "FlickrPublishing.c"
+#line 6273 "FlickrPublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = self->priv->access_phase_token_secret;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6506 "FlickrPublishing.c"
+#line 6279 "FlickrPublishing.c"
 	} else {
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = FALSE;
-#line 6510 "FlickrPublishing.c"
+#line 6283 "FlickrPublishing.c"
 	}
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 6514 "FlickrPublishing.c"
+#line 6287 "FlickrPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6520 "FlickrPublishing.c"
+#line 6293 "FlickrPublishing.c"
 	} else {
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 6524 "FlickrPublishing.c"
+#line 6297 "FlickrPublishing.c"
 	}
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6530 "FlickrPublishing.c"
+#line 6303 "FlickrPublishing.c"
 }
 
 
@@ -6575,84 +6348,84 @@ void publishing_flickr_session_authenticate_from_persistent_credentials (Publish
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (secret != NULL);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = _tmp1_;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = secret;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = username;
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = _tmp5_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 6575 "FlickrPublishing.c"
+#line 6348 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self) {
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = NULL;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = NULL;
-#line 6594 "FlickrPublishing.c"
+#line 6367 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 6601 "FlickrPublishing.c"
+#line 6374 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 6612 "FlickrPublishing.c"
+#line 6385 "FlickrPublishing.c"
 	}
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6618 "FlickrPublishing.c"
+#line 6391 "FlickrPublishing.c"
 }
 
 
@@ -6713,51 +6486,51 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	gchar* _tmp76_ = NULL;
 	const gchar* _tmp77_ = NULL;
 	PublishingFlickrUploadTransaction* _tmp78_ = NULL;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	http_method = _tmp2_;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:979: signing transaction with parameters:");
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:956: signing transaction with parameters:");
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = http_method;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:980: %s", _tmp5_);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:957: %s", _tmp5_);
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = txn;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments = _tmp8_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments_length1 = _tmp7_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = txn;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION) ? ((PublishingFlickrUploadTransaction*) _tmp9_) : NULL);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	upload_txn = _tmp10_;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = upload_txn;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp11_ != NULL) {
-#line 6723 "FlickrPublishing.c"
+#line 6496 "FlickrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
 		PublishingFlickrUploadTransaction* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6766,97 +6539,97 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		gint _auth_header_args_size_ = 0;
 		PublishingRESTSupportArgument** _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:986: %s", "this transaction is an UploadTransaction; including Authorization head" \
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:963: %s", "this transaction is an UploadTransaction; including Authorization head" \
 "er " "fields in signature base string");
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = upload_txn;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = _tmp14_;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args_length1 = _tmp13_;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_auth_header_args_size_ = auth_header_args_length1;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = auth_header_args;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15__length1 = auth_header_args_length1;
-#line 6748 "FlickrPublishing.c"
+#line 6521 "FlickrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
 			gint _arg_collection_size_ = 0;
 			gint arg_it = 0;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection = _tmp15_;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection_length1 = _tmp15__length1;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) {
-#line 6760 "FlickrPublishing.c"
+#line 6533 "FlickrPublishing.c"
 				PublishingRESTSupportArgument* _tmp16_ = NULL;
 				PublishingRESTSupportArgument* arg = NULL;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arg = _tmp16_;
-#line 6767 "FlickrPublishing.c"
+#line 6540 "FlickrPublishing.c"
 				{
 					PublishingRESTSupportArgument** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
 					PublishingRESTSupportArgument* _tmp18_ = NULL;
 					PublishingRESTSupportArgument* _tmp19_ = NULL;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17_ = base_string_arguments;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17__length1 = base_string_arguments_length1;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp18_ = arg;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_vala_array_add19 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_publishing_rest_support_argument_unref0 (arg);
-#line 6785 "FlickrPublishing.c"
+#line 6558 "FlickrPublishing.c"
 				}
 			}
 		}
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 6791 "FlickrPublishing.c"
+#line 6564 "FlickrPublishing.c"
 	}
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = base_string_arguments;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20__length1 = base_string_arguments_length1;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args = _tmp22_;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args_length1 = _tmp21_;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_sorted_args_size_ = sorted_args_length1;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = g_strdup ("");
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	arguments_string = _tmp23_;
-#line 6809 "FlickrPublishing.c"
+#line 6582 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 6814 "FlickrPublishing.c"
+#line 6587 "FlickrPublishing.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp24_ = TRUE;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6821 "FlickrPublishing.c"
+#line 6594 "FlickrPublishing.c"
 				gint _tmp26_ = 0;
 				PublishingRESTSupportArgument** _tmp27_ = NULL;
 				gint _tmp27__length1 = 0;
@@ -6879,268 +6652,268 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 				gint _tmp42_ = 0;
 				PublishingRESTSupportArgument** _tmp43_ = NULL;
 				gint _tmp43__length1 = 0;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp24_) {
-#line 6846 "FlickrPublishing.c"
+#line 6619 "FlickrPublishing.c"
 					gint _tmp25_ = 0;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = i;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp25_ + 1;
-#line 6852 "FlickrPublishing.c"
+#line 6625 "FlickrPublishing.c"
 				}
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = FALSE;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp26_ = i;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27_ = sorted_args;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27__length1 = sorted_args_length1;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp26_ < _tmp27__length1)) {
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6866 "FlickrPublishing.c"
+#line 6639 "FlickrPublishing.c"
 				}
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp28_ = arguments_string;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29_ = sorted_args;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29__length1 = sorted_args_length1;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp30_ = i;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp31_ = _tmp29_[_tmp30_];
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp32_ = _tmp31_->key;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp33_ = g_strconcat (_tmp32_, "=", NULL);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp34_ = _tmp33_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35_ = sorted_args;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35__length1 = sorted_args_length1;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp36_ = i;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp37_ = _tmp35_[_tmp36_];
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp38_ = _tmp37_->value;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp40_ = _tmp39_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (arguments_string);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arguments_string = _tmp41_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp40_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp34_);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp42_ = i;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43_ = sorted_args;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43__length1 = sorted_args_length1;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 6916 "FlickrPublishing.c"
+#line 6689 "FlickrPublishing.c"
 					const gchar* _tmp44_ = NULL;
 					gchar* _tmp45_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp44_ = arguments_string;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp45_ = g_strconcat (_tmp44_, "&", NULL);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (arguments_string);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					arguments_string = _tmp45_;
-#line 6927 "FlickrPublishing.c"
+#line 6700 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signing_key = NULL;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = self->priv->access_phase_token_secret;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp46_ != NULL) {
-#line 6938 "FlickrPublishing.c"
+#line 6711 "FlickrPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:1008: access phase token secret available; using" \
-" it as signing key");
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:985: access phase token secret available; using " \
+"it as signing key");
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp47_ = self->priv->access_phase_token_secret;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp48_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp47_, NULL);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (signing_key);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		signing_key = _tmp48_;
-#line 6951 "FlickrPublishing.c"
+#line 6724 "FlickrPublishing.c"
 	} else {
 		const gchar* _tmp49_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp49_ = self->priv->request_phase_token_secret;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp49_ != NULL) {
-#line 6958 "FlickrPublishing.c"
+#line 6731 "FlickrPublishing.c"
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:1012: request phase token secret available; usin" \
-"g it as signing key");
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_debug ("FlickrPublishing.vala:989: request phase token secret available; using" \
+" it as signing key");
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp50_ = self->priv->request_phase_token_secret;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp51_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp50_, NULL);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (signing_key);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			signing_key = _tmp51_;
-#line 6971 "FlickrPublishing.c"
+#line 6744 "FlickrPublishing.c"
 		} else {
 			gchar* _tmp52_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:1016: %s", "neither access phase nor request phase token secrets available; using " \
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_debug ("FlickrPublishing.vala:993: %s", "neither access phase nor request phase token secrets available; using " \
 "API " "key as signing key");
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp52_ = g_strdup (PUBLISHING_FLICKR_API_SECRET "&");
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (signing_key);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			signing_key = _tmp52_;
-#line 6982 "FlickrPublishing.c"
+#line 6755 "FlickrPublishing.c"
 		}
 	}
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp53_ = http_method;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp54_ = g_strconcat (_tmp53_, "&", NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp55_ = _tmp54_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp56_ = txn;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (_tmp56_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp58_ = _tmp57_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp59_ = soup_uri_encode (_tmp58_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp60_ = _tmp59_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp61_ = g_strconcat (_tmp55_, _tmp60_, NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp64_ = _tmp63_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp65_ = arguments_string;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp66_ = soup_uri_encode (_tmp65_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp67_ = _tmp66_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp68_ = g_strconcat (_tmp64_, _tmp67_, NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp69_ = _tmp68_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp67_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp64_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp62_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp60_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp58_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp55_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signature_base_string = _tmp69_;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp70_ = signature_base_string;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1026: signature base string = '%s'", _tmp70_);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:1003: signature base string = '%s'", _tmp70_);
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp71_ = signing_key;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1028: signing key = '%s'", _tmp71_);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:1005: signing key = '%s'", _tmp71_);
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp72_ = signing_key;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp73_ = signature_base_string;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp74_ = publishing_rest_support_hmac_sha1 (_tmp72_, _tmp73_);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signature = _tmp74_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp75_ = signature;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp76_ = soup_uri_encode (_tmp75_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signature = _tmp76_;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp77_ = signature;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1034: signature = '%s'", _tmp77_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:1011: signature = '%s'", _tmp77_);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp78_ = upload_txn;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp78_ != NULL) {
-#line 7065 "FlickrPublishing.c"
+#line 6838 "FlickrPublishing.c"
 		PublishingFlickrUploadTransaction* _tmp79_ = NULL;
 		const gchar* _tmp80_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp79_ = upload_txn;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp80_ = signature;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp79_, "oauth_signature", _tmp80_);
-#line 7074 "FlickrPublishing.c"
+#line 6847 "FlickrPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp81_ = NULL;
 		const gchar* _tmp82_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp81_ = txn;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp82_ = signature;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (_tmp81_, "oauth_signature", _tmp82_);
-#line 7084 "FlickrPublishing.c"
+#line 6857 "FlickrPublishing.c"
 	}
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature_base_string);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signing_key);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (arguments_string);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (http_method);
-#line 7102 "FlickrPublishing.c"
+#line 6875 "FlickrPublishing.c"
 }
 
 
@@ -7149,29 +6922,29 @@ void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSe
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (secret != NULL);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->request_phase_token);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->request_phase_token = _tmp1_;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = secret;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->request_phase_token_secret);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->request_phase_token_secret = _tmp3_;
-#line 7133 "FlickrPublishing.c"
+#line 6906 "FlickrPublishing.c"
 }
 
 
@@ -7182,41 +6955,41 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (secret != NULL);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = _tmp1_;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = secret;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = username;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = _tmp5_;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7178 "FlickrPublishing.c"
+#line 6951 "FlickrPublishing.c"
 }
 
 
@@ -7235,47 +7008,47 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self)
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = currtime;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_.tv_sec;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = currtime;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_.tv_usec;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp11_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7237 "FlickrPublishing.c"
+#line 7010 "FlickrPublishing.c"
 }
 
 
@@ -7286,39 +7059,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7260 "FlickrPublishing.c"
+#line 7033 "FlickrPublishing.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7268 "FlickrPublishing.c"
+#line 7041 "FlickrPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7280 "FlickrPublishing.c"
+#line 7053 "FlickrPublishing.c"
 	}
 }
 
@@ -7336,114 +7109,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7304 "FlickrPublishing.c"
+#line 7077 "FlickrPublishing.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7310 "FlickrPublishing.c"
+#line 7083 "FlickrPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7314 "FlickrPublishing.c"
+#line 7087 "FlickrPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7318 "FlickrPublishing.c"
+#line 7091 "FlickrPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7330 "FlickrPublishing.c"
+#line 7103 "FlickrPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7340 "FlickrPublishing.c"
+#line 7113 "FlickrPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7346 "FlickrPublishing.c"
+#line 7119 "FlickrPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7360 "FlickrPublishing.c"
+#line 7133 "FlickrPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7370 "FlickrPublishing.c"
+#line 7143 "FlickrPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7376 "FlickrPublishing.c"
+#line 7149 "FlickrPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7385 "FlickrPublishing.c"
+#line 7158 "FlickrPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7405 "FlickrPublishing.c"
+#line 7178 "FlickrPublishing.c"
 }
 
 
@@ -7454,25 +7227,25 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_get_real_time ();
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp4_;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7434 "FlickrPublishing.c"
+#line 7207 "FlickrPublishing.c"
 }
 
 
@@ -7481,21 +7254,21 @@ gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSessio
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->request_phase_token;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "request_phase_token != null");
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->request_phase_token;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7457 "FlickrPublishing.c"
+#line 7230 "FlickrPublishing.c"
 }
 
 
@@ -7504,21 +7277,21 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token;
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7480 "FlickrPublishing.c"
+#line 7253 "FlickrPublishing.c"
 }
 
 
@@ -7527,21 +7300,21 @@ gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickr
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token_secret;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7503 "FlickrPublishing.c"
+#line 7276 "FlickrPublishing.c"
 }
 
 
@@ -7550,71 +7323,71 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->username;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7526 "FlickrPublishing.c"
+#line 7299 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) {
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize;
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated;
-#line 7539 "FlickrPublishing.c"
+#line 7312 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) {
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->request_phase_token = NULL;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->request_phase_token_secret = NULL;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = NULL;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = NULL;
-#line 7556 "FlickrPublishing.c"
+#line 7329 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingFlickrSession * self;
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->request_phase_token);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->request_phase_token_secret);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj);
-#line 7576 "FlickrPublishing.c"
+#line 7349 "FlickrPublishing.c"
 }
 
 
@@ -7631,30 +7404,30 @@ GType publishing_flickr_session_get_type (void) {
 
 
 static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7595 "FlickrPublishing.c"
+#line 7368 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7602 "FlickrPublishing.c"
+#line 7375 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7609 "FlickrPublishing.c"
+#line 7382 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7616 "FlickrPublishing.c"
+#line 7389 "FlickrPublishing.c"
 }
 
 
@@ -7724,369 +7497,369 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 	gboolean _tmp79_ = FALSE;
 	GtkButton* _tmp80_ = NULL;
 	GtkButton* _tmp81_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = builder;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = builder;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = builder;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->builder;
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox));
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = _tmp9_;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->builder;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel));
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = _tmp12_;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = self->priv->builder;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = _tmp15_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->builder;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton));
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = _tmp18_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->builder;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = _tmp21_;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = self->priv->builder;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = _tmp24_;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = self->priv->builder;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = _tmp27_;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = self->priv->builder;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = _tmp30_;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = self->priv->builder;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = _tmp33_;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp34_ = parameters;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp35_ = _publishing_flickr_publishing_parameters_ref0 (_tmp34_);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp35_;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp36_ = publisher;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = _tmp37_;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp38_ = media_type;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->media_type = _tmp38_;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = _tmp40_;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = _tmp39_;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = _tmp42_;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = _tmp41_;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp43_ = _ ("You are logged into Flickr as %s.\n\n");
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp44_ = parameters;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp45_ = _tmp44_->username;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = g_strdup_printf (_tmp43_, _tmp45_);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	upload_label_text = _tmp46_;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp47_ = parameters;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp48_ = _tmp47_->user_kind;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp48_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 7864 "FlickrPublishing.c"
+#line 7637 "FlickrPublishing.c"
 		const gchar* _tmp49_ = NULL;
-		PublishingFlickrPublishingParameters* _tmp50_ = NULL;
-		gint _tmp51_ = 0;
-		const gchar* _tmp52_ = NULL;
-		PublishingFlickrPublishingParameters* _tmp53_ = NULL;
-		gint _tmp54_ = 0;
+		const gchar* _tmp50_ = NULL;
+		PublishingFlickrPublishingParameters* _tmp51_ = NULL;
+		gint64 _tmp52_ = 0LL;
+		gchar* _tmp53_ = NULL;
+		gchar* _tmp54_ = NULL;
 		gchar* _tmp55_ = NULL;
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp49_ = upload_label_text;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp50_ = parameters;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp51_ = _tmp50_->quota_free_mb;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp52_ = ngettext ("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.", "Your free Flickr account limits how much data you can upload per month" \
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp50_ = _ ("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.", (gulong) _tmp51_);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp53_ = parameters;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp54_ = _tmp53_->quota_free_mb;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp55_ = g_strdup_printf (_tmp52_, _tmp54_);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+"This month you have %s remaining in your upload quota.");
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp51_ = parameters;
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp52_ = _tmp51_->quota_free_bytes;
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp53_ = g_format_size_full ((guint64) _tmp52_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp54_ = _tmp53_;
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp55_ = g_strdup_printf (_tmp50_, _tmp54_);
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_ = _tmp55_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = g_strconcat (_tmp49_, _tmp56_, NULL);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		upload_label_text = _tmp57_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp56_);
-#line 7898 "FlickrPublishing.c"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp54_);
+#line 7673 "FlickrPublishing.c"
 	} else {
 		const gchar* _tmp58_ = NULL;
 		const gchar* _tmp59_ = NULL;
 		gchar* _tmp60_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = upload_label_text;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = g_strconcat (_tmp58_, _tmp59_, NULL);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		upload_label_text = _tmp60_;
-#line 7913 "FlickrPublishing.c"
+#line 7688 "FlickrPublishing.c"
 	}
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp61_ = self->priv->upload_info_label;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp62_ = upload_label_text;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_label_set_label (_tmp61_, _tmp62_);
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp63_ = _ ("Photos _visible to:");
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp64_ = g_strdup (_tmp63_);
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	visibility_label_text = _tmp64_;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp65_ = media_type;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp65_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7931 "FlickrPublishing.c"
+#line 7706 "FlickrPublishing.c"
 		const gchar* _tmp66_ = NULL;
 		gchar* _tmp67_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp66_ = _ ("Videos _visible to:");
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp67_ = g_strdup (_tmp66_);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		visibility_label_text = _tmp67_;
-#line 7942 "FlickrPublishing.c"
+#line 7717 "FlickrPublishing.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp68_ = 0;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp68_ = media_type;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp68_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 7949 "FlickrPublishing.c"
+#line 7724 "FlickrPublishing.c"
 			const gchar* _tmp69_ = NULL;
 			gchar* _tmp70_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp69_ = _ ("Photos and videos _visible to:");
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp70_ = g_strdup (_tmp69_);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			visibility_label_text = _tmp70_;
-#line 7960 "FlickrPublishing.c"
+#line 7735 "FlickrPublishing.c"
 		}
 	}
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp71_ = self->priv->visibility_label;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp72_ = visibility_label_text;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_label_set_label (_tmp71_, _tmp72_);
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp73_ = self->priv->visibility_combo;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp74_ = media_type;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp74_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7979 "FlickrPublishing.c"
+#line 7754 "FlickrPublishing.c"
 		GtkComboBoxText* _tmp75_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp75_ = self->priv->size_combo;
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 7987 "FlickrPublishing.c"
+#line 7762 "FlickrPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp76_ = NULL;
 		GtkLabel* _tmp77_ = NULL;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp76_ = self->priv->size_combo;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp77_ = self->priv->size_label;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7999 "FlickrPublishing.c"
+#line 7774 "FlickrPublishing.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp78_ = self->priv->strip_metadata_check;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp79_ = strip_metadata;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp79_);
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp80_ = self->priv->logout_button;
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp80_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp81_ = self->priv->publish_button;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (visibility_label_text);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8021 "FlickrPublishing.c"
+#line 7796 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata);
-#line 8028 "FlickrPublishing.c"
+#line 7803 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 8037 "FlickrPublishing.c"
+#line 7812 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 8044 "FlickrPublishing.c"
+#line 7819 "FlickrPublishing.c"
 }
 
 
@@ -8102,33 +7875,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 	SpitPublishingPublisherMediaType _tmp7_ = 0;
 	GtkCheckButton* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibilities;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = self->priv->visibilities_length1;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->visibility_combo;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_->specification;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_->visibility_specification = _tmp6_;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->media_type;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 8086 "FlickrPublishing.c"
+#line 7861 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* _tmp8_ = NULL;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -8136,116 +7909,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 		gint _tmp11_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = self->priv->parameters;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = self->priv->sizes;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9__length1 = self->priv->sizes_length1;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = _tmp9_[_tmp11_];
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_->size;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 8110 "FlickrPublishing.c"
+#line 7885 "FlickrPublishing.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->strip_metadata_check;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp15_);
-#line 8118 "FlickrPublishing.c"
+#line 7893 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 8129 "FlickrPublishing.c"
+#line 7904 "FlickrPublishing.c"
 	}
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8135 "FlickrPublishing.c"
+#line 7910 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 8146 "FlickrPublishing.c"
+#line 7921 "FlickrPublishing.c"
 	}
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8152 "FlickrPublishing.c"
+#line 7927 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 8163 "FlickrPublishing.c"
+#line 7938 "FlickrPublishing.c"
 	}
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8169 "FlickrPublishing.c"
+#line 7944 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 8180 "FlickrPublishing.c"
+#line 7955 "FlickrPublishing.c"
 	}
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8186 "FlickrPublishing.c"
+#line 7961 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 8197 "FlickrPublishing.c"
+#line 7972 "FlickrPublishing.c"
 	}
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8203 "FlickrPublishing.c"
+#line 7978 "FlickrPublishing.c"
 }
 
 
@@ -8287,118 +8060,118 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL;
 	gint _tmp26__length1 = 0;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("Everyone");
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp5_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp4_);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _result_;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6__length1 = _result__length1;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _ ("Friends & family only");
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp9_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _result_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11__length1 = _result__length1;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _ ("Family only");
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp14_);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _ ("Friends only");
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _result_;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21__length1 = _result__length1;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = _ ("Just me");
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = _tmp23_;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp25_);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp24_);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = _result_;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26__length1 = _result__length1;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp26__length1;
-#line 8343 "FlickrPublishing.c"
+#line 8118 "FlickrPublishing.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp26_;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8349 "FlickrPublishing.c"
+#line 8124 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 8356 "FlickrPublishing.c"
+#line 8131 "FlickrPublishing.c"
 }
 
 
@@ -8410,165 +8183,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->visibilities;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->visibilities_length1;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8376 "FlickrPublishing.c"
+#line 8151 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = _tmp2_;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities_length1 = _tmp1_;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 8389 "FlickrPublishing.c"
+#line 8164 "FlickrPublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 8395 "FlickrPublishing.c"
+#line 8170 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
 		gint _v_collection_size_ = 0;
 		gint v_it = 0;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection = _tmp3_;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection_length1 = _tmp3__length1;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 8407 "FlickrPublishing.c"
+#line 8182 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 8414 "FlickrPublishing.c"
+#line 8189 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = v;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 8429 "FlickrPublishing.c"
+#line 8204 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->visibility_combo;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 8441 "FlickrPublishing.c"
+#line 8216 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8452 "FlickrPublishing.c"
+#line 8227 "FlickrPublishing.c"
 	}
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8458 "FlickrPublishing.c"
+#line 8233 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8469 "FlickrPublishing.c"
+#line 8244 "FlickrPublishing.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8475 "FlickrPublishing.c"
+#line 8250 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8486 "FlickrPublishing.c"
+#line 8261 "FlickrPublishing.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8492 "FlickrPublishing.c"
+#line 8267 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8503 "FlickrPublishing.c"
+#line 8278 "FlickrPublishing.c"
 	}
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8509 "FlickrPublishing.c"
+#line 8284 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8520 "FlickrPublishing.c"
+#line 8295 "FlickrPublishing.c"
 	}
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8526 "FlickrPublishing.c"
+#line 8301 "FlickrPublishing.c"
 }
 
 
@@ -8600,88 +8373,88 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("500 × 375 pixels");
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _result_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _ ("1024 × 768 pixels");
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _result_;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _ ("2048 × 1536 pixels");
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = _result_;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _ ("4096 × 3072 pixels");
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096);
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = _result_;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _ ("Original size");
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE);
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8626 "FlickrPublishing.c"
+#line 8401 "FlickrPublishing.c"
 	}
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp16_;
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8632 "FlickrPublishing.c"
+#line 8407 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 8639 "FlickrPublishing.c"
+#line 8414 "FlickrPublishing.c"
 }
 
 
@@ -8693,80 +8466,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8659 "FlickrPublishing.c"
+#line 8434 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = _tmp2_;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes_length1 = _tmp1_;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 8672 "FlickrPublishing.c"
+#line 8447 "FlickrPublishing.c"
 	}
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 8678 "FlickrPublishing.c"
+#line 8453 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
 		gint _e_collection_size_ = 0;
 		gint e_it = 0;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection = _tmp3_;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection_length1 = _tmp3__length1;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 8690 "FlickrPublishing.c"
+#line 8465 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 8697 "FlickrPublishing.c"
+#line 8472 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = e;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 8712 "FlickrPublishing.c"
+#line 8487 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->size_combo;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 8724 "FlickrPublishing.c"
+#line 8499 "FlickrPublishing.c"
 }
 
 
@@ -8774,17 +8547,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 8742 "FlickrPublishing.c"
+#line 8517 "FlickrPublishing.c"
 }
 
 
@@ -8792,41 +8565,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 8760 "FlickrPublishing.c"
+#line 8535 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata_check;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp1_);
-#line 8775 "FlickrPublishing.c"
+#line 8550 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 8784 "FlickrPublishing.c"
+#line 8559 "FlickrPublishing.c"
 }
 
 
@@ -8835,56 +8608,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8803 "FlickrPublishing.c"
+#line 8578 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8816 "FlickrPublishing.c"
+#line 8591 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8823 "FlickrPublishing.c"
+#line 8598 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8830 "FlickrPublishing.c"
+#line 8605 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 8842 "FlickrPublishing.c"
+#line 8617 "FlickrPublishing.c"
 }
 
 
@@ -8892,17 +8665,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingFlickrPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 8860 "FlickrPublishing.c"
+#line 8635 "FlickrPublishing.c"
 }
 
 
@@ -8911,240 +8684,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_title;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp1_;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_size;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->size = _tmp2_;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8887 "FlickrPublishing.c"
+#line 8662 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 8894 "FlickrPublishing.c"
+#line 8669 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8901 "FlickrPublishing.c"
+#line 8676 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 8910 "FlickrPublishing.c"
+#line 8685 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer);
-#line 8920 "FlickrPublishing.c"
+#line 8695 "FlickrPublishing.c"
 	} else {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8924 "FlickrPublishing.c"
+#line 8699 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8932 "FlickrPublishing.c"
+#line 8707 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8939 "FlickrPublishing.c"
+#line 8714 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneSizeEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8946 "FlickrPublishing.c"
+#line 8721 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 8950 "FlickrPublishing.c"
+#line 8725 "FlickrPublishing.c"
 		}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 8954 "FlickrPublishing.c"
+#line 8729 "FlickrPublishing.c"
 	} else {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8958 "FlickrPublishing.c"
+#line 8733 "FlickrPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8962 "FlickrPublishing.c"
+#line 8737 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8973 "FlickrPublishing.c"
+#line 8748 "FlickrPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 8979 "FlickrPublishing.c"
+#line 8754 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8983 "FlickrPublishing.c"
+#line 8758 "FlickrPublishing.c"
 	} else {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 8987 "FlickrPublishing.c"
+#line 8762 "FlickrPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8991 "FlickrPublishing.c"
+#line 8766 "FlickrPublishing.c"
 }
 
 
 static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry* spec;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9005 "FlickrPublishing.c"
+#line 8780 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9014 "FlickrPublishing.c"
+#line 8789 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 9034 "FlickrPublishing.c"
+#line 8809 "FlickrPublishing.c"
 	} else {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9038 "FlickrPublishing.c"
+#line 8813 "FlickrPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 9044 "FlickrPublishing.c"
+#line 8819 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9063 "FlickrPublishing.c"
+#line 8838 "FlickrPublishing.c"
 	} else {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9067 "FlickrPublishing.c"
+#line 8842 "FlickrPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 9073 "FlickrPublishing.c"
+#line 8848 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 9083 "FlickrPublishing.c"
+#line 8858 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 9090 "FlickrPublishing.c"
+#line 8865 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 9102 "FlickrPublishing.c"
+#line 8877 "FlickrPublishing.c"
 }
 
 
@@ -9165,24 +8938,24 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void
 static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
 	self = instance;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 9127 "FlickrPublishing.c"
+#line 8902 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
 	self = instance;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9140 "FlickrPublishing.c"
+#line 8915 "FlickrPublishing.c"
 	}
 }
 
@@ -9193,248 +8966,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
 	PublishingFlickrVisibilitySpecification* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL);
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_specification;
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->specification = _tmp1_;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_title;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp3_;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 9175 "FlickrPublishing.c"
+#line 8950 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification);
-#line 9182 "FlickrPublishing.c"
+#line 8957 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9189 "FlickrPublishing.c"
+#line 8964 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 9198 "FlickrPublishing.c"
+#line 8973 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer);
-#line 9208 "FlickrPublishing.c"
+#line 8983 "FlickrPublishing.c"
 	} else {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9212 "FlickrPublishing.c"
+#line 8987 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9220 "FlickrPublishing.c"
+#line 8995 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9227 "FlickrPublishing.c"
+#line 9002 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9234 "FlickrPublishing.c"
+#line 9009 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 9238 "FlickrPublishing.c"
+#line 9013 "FlickrPublishing.c"
 		}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 9242 "FlickrPublishing.c"
+#line 9017 "FlickrPublishing.c"
 	} else {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9246 "FlickrPublishing.c"
+#line 9021 "FlickrPublishing.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9250 "FlickrPublishing.c"
+#line 9025 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9261 "FlickrPublishing.c"
+#line 9036 "FlickrPublishing.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 9267 "FlickrPublishing.c"
+#line 9042 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9271 "FlickrPublishing.c"
+#line 9046 "FlickrPublishing.c"
 	} else {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 9275 "FlickrPublishing.c"
+#line 9050 "FlickrPublishing.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9279 "FlickrPublishing.c"
+#line 9054 "FlickrPublishing.c"
 }
 
 
 static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry* spec;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9293 "FlickrPublishing.c"
+#line 9068 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9302 "FlickrPublishing.c"
+#line 9077 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 9322 "FlickrPublishing.c"
+#line 9097 "FlickrPublishing.c"
 	} else {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9326 "FlickrPublishing.c"
+#line 9101 "FlickrPublishing.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9332 "FlickrPublishing.c"
+#line 9107 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9351 "FlickrPublishing.c"
+#line 9126 "FlickrPublishing.c"
 	} else {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9355 "FlickrPublishing.c"
+#line 9130 "FlickrPublishing.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9361 "FlickrPublishing.c"
+#line 9136 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 9371 "FlickrPublishing.c"
+#line 9146 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 9378 "FlickrPublishing.c"
+#line 9153 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 9392 "FlickrPublishing.c"
+#line 9167 "FlickrPublishing.c"
 }
 
 
@@ -9455,134 +9228,134 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
 	self = instance;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 9417 "FlickrPublishing.c"
+#line 9192 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
 	self = instance;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9430 "FlickrPublishing.c"
+#line 9205 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate));
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9446 "FlickrPublishing.c"
+#line 9221 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled;
-#line 9461 "FlickrPublishing.c"
+#line 9236 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = NULL;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = NULL;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = NULL;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = NULL;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = 0;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 9502 "FlickrPublishing.c"
+#line 9277 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 9540 "FlickrPublishing.c"
+#line 9315 "FlickrPublishing.c"
 }
 
 
@@ -9608,57 +9381,57 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ
 	PublishingFlickrPublishingParameters* _tmp2_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishables;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = strip_metadata;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata = _tmp4_;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 9592 "FlickrPublishing.c"
+#line 9367 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata);
-#line 9599 "FlickrPublishing.c"
+#line 9374 "FlickrPublishing.c"
 }
 
 
 static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 9610 "FlickrPublishing.c"
+#line 9385 "FlickrPublishing.c"
 	}
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 9616 "FlickrPublishing.c"
+#line 9391 "FlickrPublishing.c"
 }
 
 
@@ -9676,25 +9449,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	GExiv2Metadata* _tmp32_ = NULL;
 	gboolean _tmp33_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishable;
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9646 "FlickrPublishing.c"
+#line 9421 "FlickrPublishing.c"
 	}
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gexiv2_metadata_new ();
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishable_metadata = _tmp2_;
-#line 9652 "FlickrPublishing.c"
+#line 9427 "FlickrPublishing.c"
 	{
 		GExiv2Metadata* _tmp3_ = NULL;
 		SpitPublishingPublishable* _tmp4_ = NULL;
@@ -9702,27 +9475,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = publishable_metadata;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishable;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9680 "FlickrPublishing.c"
+#line 9455 "FlickrPublishing.c"
 			goto __catch25_g_error;
 		}
 	}
@@ -9735,129 +9508,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = publishable;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:1305: couldn't read metadata from file '%s' for " \
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:1279: couldn't read metadata from file '%s' for " \
 "upload preprocessing.", _tmp13_);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 9715 "FlickrPublishing.c"
+#line 9490 "FlickrPublishing.c"
 	}
 	__finally25:
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9728 "FlickrPublishing.c"
+#line 9503 "FlickrPublishing.c"
 	}
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishable_metadata;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp15_) {
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9740 "FlickrPublishing.c"
+#line 9515 "FlickrPublishing.c"
 	}
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishable_metadata;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp17_) {
-#line 9748 "FlickrPublishing.c"
+#line 9523 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp18_ = NULL;
 		GExiv2Metadata* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp18_ = publishable_metadata;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp19_ = publishable_metadata;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = _tmp20_;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp23_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp21_);
-#line 9773 "FlickrPublishing.c"
+#line 9548 "FlickrPublishing.c"
 	}
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = publishable_metadata;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp25_) {
-#line 9781 "FlickrPublishing.c"
+#line 9556 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp26_ = NULL;
 		GExiv2Metadata* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = publishable_metadata;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = publishable_metadata;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp29_ = _tmp28_;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp31_);
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp29_);
-#line 9806 "FlickrPublishing.c"
+#line 9581 "FlickrPublishing.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = publishable_metadata;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp33_) {
-#line 9814 "FlickrPublishing.c"
+#line 9589 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
 		GeeHashSet* _tmp34_ = NULL;
 		gchar** iptc_keywords = NULL;
@@ -9897,179 +9670,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GExiv2Metadata* _tmp60_ = NULL;
 		gchar** _tmp61_ = NULL;
 		gint _tmp61__length1 = 0;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp35_ = publishable_metadata;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = _tmp37_;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords_length1 = _vala_array_length (_tmp36_);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_iptc_keywords_size_ = iptc_keywords_length1;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38_ = iptc_keywords;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38__length1 = iptc_keywords_length1;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 9874 "FlickrPublishing.c"
+#line 9649 "FlickrPublishing.c"
 			gchar** _tmp39_ = NULL;
 			gint _tmp39__length1 = 0;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39_ = iptc_keywords;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39__length1 = iptc_keywords_length1;
-#line 9881 "FlickrPublishing.c"
+#line 9656 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp39_;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp39__length1;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 9893 "FlickrPublishing.c"
+#line 9668 "FlickrPublishing.c"
 					gchar* _tmp40_ = NULL;
 					gchar* keyword = NULL;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 9900 "FlickrPublishing.c"
+#line 9675 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp41_ = NULL;
 						const gchar* _tmp42_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp42_ = keyword;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9912 "FlickrPublishing.c"
+#line 9687 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp43_ = publishable_metadata;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = _tmp45_;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords_length1 = _vala_array_length (_tmp44_);
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_xmp_keywords_size_ = xmp_keywords_length1;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46_ = xmp_keywords;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46__length1 = xmp_keywords_length1;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp46_ != NULL) {
-#line 9933 "FlickrPublishing.c"
+#line 9708 "FlickrPublishing.c"
 			gchar** _tmp47_ = NULL;
 			gint _tmp47__length1 = 0;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47_ = xmp_keywords;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47__length1 = xmp_keywords_length1;
-#line 9940 "FlickrPublishing.c"
+#line 9715 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp47_;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp47__length1;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 9952 "FlickrPublishing.c"
+#line 9727 "FlickrPublishing.c"
 					gchar* _tmp48_ = NULL;
 					gchar* keyword = NULL;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp48_;
-#line 9959 "FlickrPublishing.c"
+#line 9734 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp49_ = NULL;
 						const gchar* _tmp50_ = NULL;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp49_ = keyword_set;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp50_ = keyword;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9971 "FlickrPublishing.c"
+#line 9746 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp51_ = keyword_set;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp53_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp52_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = _tmp53_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords_length1 = _tmp52_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_all_keywords_size_ = all_keywords_length1;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54_ = all_keywords;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54__length1 = all_keywords_length1;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp55_ = g_new0 (gchar*, 1 + 1);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = _tmp55_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords_length1 = 1;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_no_keywords_size_ = no_keywords_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_ = no_keywords;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56__length1 = no_keywords_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp56_[0]);
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_[0] = NULL;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = _tmp56_[0];
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = publishable_metadata;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = all_keywords;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59__length1 = all_keywords_length1;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = publishable_metadata;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61_ = no_keywords;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61__length1 = no_keywords_length1;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 10026 "FlickrPublishing.c"
+#line 9801 "FlickrPublishing.c"
 		{
 			GExiv2Metadata* _tmp62_ = NULL;
 			SpitPublishingPublishable* _tmp63_ = NULL;
@@ -10077,27 +9850,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp65_ = NULL;
 			gchar* _tmp66_ = NULL;
 			gchar* _tmp67_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp62_ = publishable_metadata;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp63_ = publishable;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp65_ = _tmp64_;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp66_ = g_file_get_path (_tmp65_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp67_ = _tmp66_;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp67_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp65_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10054 "FlickrPublishing.c"
+#line 9829 "FlickrPublishing.c"
 				goto __catch26_g_error;
 			}
 		}
@@ -10110,69 +9883,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp70_ = NULL;
 			gchar* _tmp71_ = NULL;
 			gchar* _tmp72_ = NULL;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = NULL;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp68_ = publishable;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp70_ = _tmp69_;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp71_ = g_file_get_path (_tmp70_);
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp72_ = _tmp71_;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_warning ("FlickrPublishing.vala:1358: couldn't write metadata to file '%s' for u" \
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_warning ("FlickrPublishing.vala:1332: couldn't write metadata to file '%s' for u" \
 "pload preprocessing.", _tmp72_);
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp72_);
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp70_);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 10089 "FlickrPublishing.c"
+#line 9864 "FlickrPublishing.c"
 		}
 		__finally26:
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (keyword_set);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (publishable_metadata);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 10112 "FlickrPublishing.c"
+#line 9887 "FlickrPublishing.c"
 		}
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 10124 "FlickrPublishing.c"
+#line 9899 "FlickrPublishing.c"
 	}
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 10128 "FlickrPublishing.c"
+#line 9903 "FlickrPublishing.c"
 }
 
 
@@ -10188,73 +9961,73 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
 	SpitPublishingPublishable* _tmp6_ = NULL;
 	PublishingFlickrUploadTransaction* _tmp7_ = NULL;
 	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_preprocess_publishable (self, _tmp1_);
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->parameters;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp8_;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 10178 "FlickrPublishing.c"
+#line 9953 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction;
-#line 10191 "FlickrPublishing.c"
+#line 9966 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 10198 "FlickrPublishing.c"
+#line 9973 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingFlickrUploader * self;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 10210 "FlickrPublishing.c"
+#line 9985 "FlickrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index c214ce9..1702288 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -87,7 +87,7 @@ internal class VisibilitySpecification {
 // not a struct because we want reference semantics
 internal class PublishingParameters {
     public UserKind user_kind;
-    public int quota_free_mb;
+    public int64 quota_free_bytes;
     public int photo_major_axis_size;
     public string username;
     public VisibilitySpecification visibility_specification;
@@ -389,20 +389,10 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         
         string? oauth_token = null;
         string? oauth_token_secret = null;
-        
-        string[] key_value_pairs = response.split("&");
-        foreach (string pair in key_value_pairs) {
-            string[] split_pair = pair.split("=");
-            
-            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", response));
-
-            if (split_pair[0] == "oauth_token")
-                oauth_token = split_pair[1];
-            else if (split_pair[0] == "oauth_token_secret")
-                oauth_token_secret = split_pair[1];
-        }
+
+        var data = Soup.Form.decode(response);
+        data.lookup_extended("oauth_token", null, out oauth_token);
+        data.lookup_extended("oauth_token_secret", null, out oauth_token_secret);
         
         if (oauth_token == null || oauth_token_secret == null)
             host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
@@ -469,32 +459,19 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     
     private void do_extract_access_phase_credentials_from_reponse(string response) {
         debug("ACTION: extracting access phase credentials from '%s'", response);
-        
-        string[] key_value_pairs = response.split("&");
 
         string? token = null;
         string? token_secret = null;
         string? username = null;
-        foreach (string key_value_pair in key_value_pairs) {
-            string[] split_pair = key_value_pair.split("=");
 
-            if (split_pair.length != 2)
-                continue;
+        var data = Soup.Form.decode(response);
+        data.lookup_extended("oauth_token", null, out token);
+        data.lookup_extended("oauth_token_secret", null, out token_secret);
+        data.lookup_extended("username", null, out username);
 
-            string key = split_pair[0];
-            string value = split_pair[1];
-            
-            if (key == "oauth_token")
-                token = value;
-            else if (key == "oauth_token_secret")
-                token_secret = value;
-            else if (key == "username")
-                username = value;
-        }
-        
         debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }",
             token, token_secret, username);
-        
+
         if (token == null || token_secret == null || username == null)
             host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " +
                 "access phase credentials to contain token, token secret, and username but at " +
@@ -543,9 +520,9 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
                 throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
                     "Unable to determine if user has free or pro account");
             
-            int quota_mb_left = int.parse(remaining_kb_str) / 1024;
+            var quota_bytes_left = int64.parse(remaining_kb_str) * 1024;
 
-            parameters.quota_free_mb = quota_mb_left;
+            parameters.quota_free_bytes = quota_bytes_left;
             parameters.user_kind = user_kind;
 
         } catch (Spit.Publishing.PublishingError err) {
@@ -1151,10 +1128,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
         string upload_label_text = _("You are logged into Flickr as %s.\n\n").printf(parameters.username);
         if (parameters.user_kind == UserKind.FREE) {
-            upload_label_text += ngettext(
-            "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabyte remaining in your upload quota.",
-            "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabytes remaining in your upload quota.",
-            parameters.quota_free_mb).printf(parameters.quota_free_mb);
+            upload_label_text += _("Your free Flickr account limits how much data you can upload per month.\nThis month you have %s remaining in your upload quota.").printf(GLib.format_size(parameters.quota_free_bytes, FormatSizeFlags.LONG_FORMAT | FormatSizeFlags.IEC_UNITS));
         } else {
             upload_label_text += _("Your Flickr Pro account entitles you to unlimited uploads.");
         }
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 354eaca..5adb572 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -1,4 +1,4 @@
-/* PicasaPublishing.c generated by valac 0.32.1, the Vala compiler
+/* PicasaPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from PicasaPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -485,7 +485,6 @@ 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);
@@ -543,8 +542,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  {
@@ -571,7 +570,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 563 "PicasaPublishing.c"
+#line 562 "PicasaPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -584,18 +583,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 576 "PicasaPublishing.c"
+#line 575 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 580 "PicasaPublishing.c"
+#line 579 "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 587 "PicasaPublishing.c"
+#line 586 "PicasaPublishing.c"
 }
 
 
@@ -617,7 +616,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 609 "PicasaPublishing.c"
+#line 608 "PicasaPublishing.c"
 }
 
 
@@ -630,7 +629,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 622 "PicasaPublishing.c"
+#line 621 "PicasaPublishing.c"
 }
 
 
@@ -643,14 +642,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 635 "PicasaPublishing.c"
+#line 634 "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 642 "PicasaPublishing.c"
+#line 641 "PicasaPublishing.c"
 }
 
 
@@ -661,17 +660,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 653 "PicasaPublishing.c"
+#line 652 "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 659 "PicasaPublishing.c"
+#line 658 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 663 "PicasaPublishing.c"
+#line 662 "PicasaPublishing.c"
 }
 
 
@@ -753,7 +752,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 745 "PicasaPublishing.c"
+#line 744 "PicasaPublishing.c"
 }
 
 
@@ -774,7 +773,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 766 "PicasaPublishing.c"
+#line 765 "PicasaPublishing.c"
 }
 
 
@@ -787,7 +786,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 779 "PicasaPublishing.c"
+#line 778 "PicasaPublishing.c"
 }
 
 
@@ -795,7 +794,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 787 "PicasaPublishing.c"
+#line 786 "PicasaPublishing.c"
 }
 
 
@@ -804,7 +803,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 796 "PicasaPublishing.c"
+#line 795 "PicasaPublishing.c"
 }
 
 
@@ -821,7 +820,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 813 "PicasaPublishing.c"
+#line 812 "PicasaPublishing.c"
 }
 
 
@@ -832,7 +831,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 824 "PicasaPublishing.c"
+#line 823 "PicasaPublishing.c"
 }
 
 
@@ -846,7 +845,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 838 "PicasaPublishing.c"
+#line 837 "PicasaPublishing.c"
 }
 
 
@@ -906,7 +905,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 898 "PicasaPublishing.c"
+#line 897 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -918,14 +917,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 910 "PicasaPublishing.c"
+#line 909 "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 917 "PicasaPublishing.c"
+#line 916 "PicasaPublishing.c"
 			{
 				SpitPublishingPublisherMediaType _tmp8_ = 0;
 				SpitPublishingPublishable* _tmp9_ = NULL;
@@ -940,12 +939,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 932 "PicasaPublishing.c"
+#line 931 "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 937 "PicasaPublishing.c"
+#line 936 "PicasaPublishing.c"
 	}
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = self->priv->publishing_parameters;
@@ -977,14 +976,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 969 "PicasaPublishing.c"
+#line 968 "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 976 "PicasaPublishing.c"
+#line 975 "PicasaPublishing.c"
 }
 
 
@@ -995,13 +994,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 987 "PicasaPublishing.c"
+#line 986 "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 993 "PicasaPublishing.c"
+#line 992 "PicasaPublishing.c"
 }
 
 
@@ -1035,7 +1034,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 1027 "PicasaPublishing.c"
+#line 1026 "PicasaPublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1044,7 +1043,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 1036 "PicasaPublishing.c"
+#line 1035 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -1054,13 +1053,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 1046 "PicasaPublishing.c"
+#line 1045 "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 1052 "PicasaPublishing.c"
+#line 1051 "PicasaPublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1075,7 +1074,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 1067 "PicasaPublishing.c"
+#line 1066 "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);
@@ -1085,7 +1084,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 1077 "PicasaPublishing.c"
+#line 1076 "PicasaPublishing.c"
 			}
 		}
 	}
@@ -1095,7 +1094,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 1087 "PicasaPublishing.c"
+#line 1086 "PicasaPublishing.c"
 			xmlNode* _tmp12_ = NULL;
 			xmlNode* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -1111,7 +1110,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 1103 "PicasaPublishing.c"
+#line 1102 "PicasaPublishing.c"
 				xmlNode* _tmp10_ = NULL;
 				xmlNode* _tmp11_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1120,7 +1119,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 1112 "PicasaPublishing.c"
+#line 1111 "PicasaPublishing.c"
 			}
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp9_ = FALSE;
@@ -1130,7 +1129,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 1122 "PicasaPublishing.c"
+#line 1121 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp13_ = doc_node_iter;
@@ -1140,7 +1139,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 1132 "PicasaPublishing.c"
+#line 1131 "PicasaPublishing.c"
 			}
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			name_val = NULL;
@@ -1152,20 +1151,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 1144 "PicasaPublishing.c"
+#line 1143 "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 1151 "PicasaPublishing.c"
+#line 1150 "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 1157 "PicasaPublishing.c"
+#line 1156 "PicasaPublishing.c"
 						xmlNode* _tmp18_ = NULL;
 						xmlNode* _tmp19_ = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1174,7 +1173,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 1166 "PicasaPublishing.c"
+#line 1165 "PicasaPublishing.c"
 					}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -1184,7 +1183,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 1176 "PicasaPublishing.c"
+#line 1175 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = album_node_iter;
@@ -1192,7 +1191,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 1184 "PicasaPublishing.c"
+#line 1183 "PicasaPublishing.c"
 						xmlNode* _tmp23_ = NULL;
 						gchar* _tmp24_ = NULL;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1203,7 +1202,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 1195 "PicasaPublishing.c"
+#line 1194 "PicasaPublishing.c"
 					} else {
 						xmlNode* _tmp25_ = NULL;
 						const gchar* _tmp26_ = NULL;
@@ -1213,7 +1212,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 1205 "PicasaPublishing.c"
+#line 1204 "PicasaPublishing.c"
 							xmlNode* _tmp27_ = NULL;
 							xmlNs* _tmp28_ = NULL;
 							const gchar* _tmp29_ = NULL;
@@ -1229,7 +1228,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 1221 "PicasaPublishing.c"
+#line 1220 "PicasaPublishing.c"
 							}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_tmp30_ = album_node_iter;
@@ -1239,7 +1238,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 1231 "PicasaPublishing.c"
+#line 1230 "PicasaPublishing.c"
 						}
 					}
 				}
@@ -1260,7 +1259,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 1252 "PicasaPublishing.c"
+#line 1251 "PicasaPublishing.c"
 		}
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1271,13 +1270,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 1263 "PicasaPublishing.c"
+#line 1262 "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 1269 "PicasaPublishing.c"
+#line 1268 "PicasaPublishing.c"
 }
 
 
@@ -1324,7 +1323,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 1316 "PicasaPublishing.c"
+#line 1315 "PicasaPublishing.c"
 }
 
 
@@ -1371,7 +1370,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 1363 "PicasaPublishing.c"
+#line 1362 "PicasaPublishing.c"
 }
 
 
@@ -1389,13 +1388,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 1380 "PicasaPublishing.c"
+#line 1379 "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 1386 "PicasaPublishing.c"
+#line 1385 "PicasaPublishing.c"
 }
 
 
@@ -1449,21 +1448,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 1440 "PicasaPublishing.c"
+#line 1439 "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 1447 "PicasaPublishing.c"
+#line 1446 "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 1454 "PicasaPublishing.c"
+#line 1453 "PicasaPublishing.c"
 }
 
 
@@ -1496,7 +1495,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 1487 "PicasaPublishing.c"
+#line 1486 "PicasaPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \
@@ -1505,7 +1504,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 1495 "PicasaPublishing.c"
+#line 1494 "PicasaPublishing.c"
 }
 
 
@@ -1543,7 +1542,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 1533 "PicasaPublishing.c"
+#line 1532 "PicasaPublishing.c"
 	}
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
@@ -1564,7 +1563,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 1553 "PicasaPublishing.c"
+#line 1552 "PicasaPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
@@ -1574,13 +1573,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 1563 "PicasaPublishing.c"
+#line 1562 "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 1569 "PicasaPublishing.c"
+#line 1568 "PicasaPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
@@ -1590,7 +1589,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 1579 "PicasaPublishing.c"
+#line 1578 "PicasaPublishing.c"
 	}
 }
 
@@ -1605,14 +1604,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 1594 "PicasaPublishing.c"
+#line 1593 "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 1600 "PicasaPublishing.c"
+#line 1599 "PicasaPublishing.c"
 }
 
 
@@ -1629,7 +1628,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 1617 "PicasaPublishing.c"
+#line 1616 "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" \
@@ -1646,11 +1645,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 1633 "PicasaPublishing.c"
+#line 1632 "PicasaPublishing.c"
 	} else {
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_do_upload (self);
-#line 1637 "PicasaPublishing.c"
+#line 1636 "PicasaPublishing.c"
 	}
 }
 
@@ -1658,21 +1657,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 1645 "PicasaPublishing.c"
+#line 1644 "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 1652 "PicasaPublishing.c"
+#line 1651 "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 1659 "PicasaPublishing.c"
+#line 1658 "PicasaPublishing.c"
 }
 
 
@@ -1681,7 +1680,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 1668 "PicasaPublishing.c"
+#line 1667 "PicasaPublishing.c"
 }
 
 
@@ -1728,7 +1727,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 1715 "PicasaPublishing.c"
+#line 1714 "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" \
@@ -1739,7 +1738,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 1725 "PicasaPublishing.c"
+#line 1724 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
 		PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL;
@@ -1766,7 +1765,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 1752 "PicasaPublishing.c"
+#line 1751 "PicasaPublishing.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1779,7 +1778,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 1765 "PicasaPublishing.c"
+#line 1764 "PicasaPublishing.c"
 		}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = _tmp7_;
@@ -1791,7 +1790,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 1777 "PicasaPublishing.c"
+#line 1776 "PicasaPublishing.c"
 	}
 	goto __finally7;
 	__catch7_spit_publishing_publishing_error:
@@ -1817,7 +1816,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 1803 "PicasaPublishing.c"
+#line 1802 "PicasaPublishing.c"
 	}
 	__finally7:
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1832,7 +1831,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 1818 "PicasaPublishing.c"
+#line 1817 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp16_ = NULL;
@@ -1860,7 +1859,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 1846 "PicasaPublishing.c"
+#line 1845 "PicasaPublishing.c"
 				goto __catch8_spit_publishing_publishing_error;
 			}
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1875,7 +1874,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 1861 "PicasaPublishing.c"
+#line 1860 "PicasaPublishing.c"
 		}
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp21_ = _tmp16_;
@@ -1895,7 +1894,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 1881 "PicasaPublishing.c"
+#line 1880 "PicasaPublishing.c"
 	}
 	goto __finally8;
 	__catch8_spit_publishing_publishing_error:
@@ -1923,7 +1922,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 1909 "PicasaPublishing.c"
+#line 1908 "PicasaPublishing.c"
 	}
 	__finally8:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1940,7 +1939,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 1926 "PicasaPublishing.c"
+#line 1925 "PicasaPublishing.c"
 	}
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp24_ = response_albums;
@@ -1948,7 +1947,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 1934 "PicasaPublishing.c"
+#line 1933 "PicasaPublishing.c"
 		SpitPublishingPluginHost* _tmp25_ = NULL;
 		GError* _tmp26_ = NULL;
 		GError* _tmp27_ = NULL;
@@ -1971,7 +1970,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 1956 "PicasaPublishing.c"
+#line 1955 "PicasaPublishing.c"
 	}
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp28_ = self->priv->publishing_parameters;
@@ -1993,7 +1992,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 1978 "PicasaPublishing.c"
+#line 1977 "PicasaPublishing.c"
 }
 
 
@@ -2030,7 +2029,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 2015 "PicasaPublishing.c"
+#line 2014 "PicasaPublishing.c"
 	}
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
@@ -2049,7 +2048,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 2033 "PicasaPublishing.c"
+#line 2032 "PicasaPublishing.c"
 }
 
 
@@ -2070,7 +2069,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 2054 "PicasaPublishing.c"
+#line 2053 "PicasaPublishing.c"
 	}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -2093,21 +2092,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 2076 "PicasaPublishing.c"
+#line 2075 "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 2083 "PicasaPublishing.c"
+#line 2082 "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 2090 "PicasaPublishing.c"
+#line 2089 "PicasaPublishing.c"
 }
 
 
@@ -2128,7 +2127,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 2111 "PicasaPublishing.c"
+#line 2110 "PicasaPublishing.c"
 	}
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = num_published;
@@ -2149,7 +2148,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 2131 "PicasaPublishing.c"
+#line 2130 "PicasaPublishing.c"
 }
 
 
@@ -2173,7 +2172,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 2155 "PicasaPublishing.c"
+#line 2154 "PicasaPublishing.c"
 	}
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = err;
@@ -2200,14 +2199,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 2181 "PicasaPublishing.c"
+#line 2180 "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 2188 "PicasaPublishing.c"
+#line 2187 "PicasaPublishing.c"
 }
 
 
@@ -2221,7 +2220,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 2202 "PicasaPublishing.c"
+#line 2201 "PicasaPublishing.c"
 }
 
 
@@ -2263,7 +2262,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 2243 "PicasaPublishing.c"
+#line 2242 "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_);
@@ -2271,7 +2270,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 2251 "PicasaPublishing.c"
+#line 2250 "PicasaPublishing.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2282,7 +2281,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 2262 "PicasaPublishing.c"
+#line 2261 "PicasaPublishing.c"
 		}
 	}
 	goto __finally9;
@@ -2300,7 +2299,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 2280 "PicasaPublishing.c"
+#line 2279 "PicasaPublishing.c"
 	}
 	__finally9:
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2313,11 +2312,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 2293 "PicasaPublishing.c"
+#line 2292 "PicasaPublishing.c"
 	}
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2297 "PicasaPublishing.c"
+#line 2296 "PicasaPublishing.c"
 }
 
 
@@ -2331,7 +2330,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 2310 "PicasaPublishing.c"
+#line 2309 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
@@ -2358,7 +2357,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 2337 "PicasaPublishing.c"
+#line 2336 "PicasaPublishing.c"
 				goto __catch10_spit_publishing_publishing_error;
 			}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2369,7 +2368,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 2348 "PicasaPublishing.c"
+#line 2347 "PicasaPublishing.c"
 		}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp0_;
@@ -2381,7 +2380,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 2360 "PicasaPublishing.c"
+#line 2359 "PicasaPublishing.c"
 	}
 	goto __finally10;
 	__catch10_spit_publishing_publishing_error:
@@ -2405,7 +2404,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 2384 "PicasaPublishing.c"
+#line 2383 "PicasaPublishing.c"
 	}
 	__finally10:
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2418,7 +2417,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 2397 "PicasaPublishing.c"
+#line 2396 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp9_ = NULL;
@@ -2445,7 +2444,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 2424 "PicasaPublishing.c"
+#line 2423 "PicasaPublishing.c"
 				goto __catch11_spit_publishing_publishing_error;
 			}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2456,7 +2455,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 2435 "PicasaPublishing.c"
+#line 2434 "PicasaPublishing.c"
 		}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = self->priv->publishing_parameters;
@@ -2464,7 +2463,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 2443 "PicasaPublishing.c"
+#line 2442 "PicasaPublishing.c"
 	}
 	goto __finally11;
 	__catch11_spit_publishing_publishing_error:
@@ -2488,7 +2487,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 2467 "PicasaPublishing.c"
+#line 2466 "PicasaPublishing.c"
 	}
 	__finally11:
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2501,27 +2500,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 2480 "PicasaPublishing.c"
+#line 2479 "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 2486 "PicasaPublishing.c"
+#line 2485 "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 2493 "PicasaPublishing.c"
+#line 2492 "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 2500 "PicasaPublishing.c"
+#line 2499 "PicasaPublishing.c"
 }
 
 
@@ -2546,7 +2545,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 2525 "PicasaPublishing.c"
+#line 2524 "PicasaPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2555,7 +2554,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 2534 "PicasaPublishing.c"
+#line 2533 "PicasaPublishing.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -2598,7 +2597,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 2576 "PicasaPublishing.c"
+#line 2575 "PicasaPublishing.c"
 	}
 	__finally12:
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2611,7 +2610,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 2589 "PicasaPublishing.c"
+#line 2588 "PicasaPublishing.c"
 	}
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = builder;
@@ -2643,7 +2642,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 2621 "PicasaPublishing.c"
+#line 2620 "PicasaPublishing.c"
 }
 
 
@@ -2710,7 +2709,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 2687 "PicasaPublishing.c"
+#line 2686 "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_);
@@ -2718,7 +2717,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 2695 "PicasaPublishing.c"
+#line 2694 "PicasaPublishing.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2729,7 +2728,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 2706 "PicasaPublishing.c"
+#line 2705 "PicasaPublishing.c"
 		}
 	}
 	goto __finally13;
@@ -2750,7 +2749,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 2727 "PicasaPublishing.c"
+#line 2726 "PicasaPublishing.c"
 	}
 	__finally13:
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2763,18 +2762,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 2740 "PicasaPublishing.c"
+#line 2739 "PicasaPublishing.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 2744 "PicasaPublishing.c"
+#line 2743 "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 2751 "PicasaPublishing.c"
+#line 2750 "PicasaPublishing.c"
 }
 
 
@@ -2847,7 +2846,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 2823 "PicasaPublishing.c"
+#line 2822 "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));
@@ -2893,7 +2892,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 2869 "PicasaPublishing.c"
+#line 2868 "PicasaPublishing.c"
 }
 
 
@@ -2912,7 +2911,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 2888 "PicasaPublishing.c"
+#line 2887 "PicasaPublishing.c"
 }
 
 
@@ -2943,7 +2942,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 2919 "PicasaPublishing.c"
+#line 2918 "PicasaPublishing.c"
 }
 
 
@@ -2959,7 +2958,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 2935 "PicasaPublishing.c"
+#line 2934 "PicasaPublishing.c"
 }
 
 
@@ -2977,7 +2976,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 2953 "PicasaPublishing.c"
+#line 2952 "PicasaPublishing.c"
 	}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
@@ -2987,14 +2986,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 2963 "PicasaPublishing.c"
+#line 2962 "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 2970 "PicasaPublishing.c"
+#line 2969 "PicasaPublishing.c"
 	}
 }
 
@@ -3017,7 +3016,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 2993 "PicasaPublishing.c"
+#line 2992 "PicasaPublishing.c"
 }
 
 
@@ -3038,14 +3037,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 3014 "PicasaPublishing.c"
+#line 3013 "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 3021 "PicasaPublishing.c"
+#line 3020 "PicasaPublishing.c"
 }
 
 
@@ -3067,7 +3066,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 3043 "PicasaPublishing.c"
+#line 3042 "PicasaPublishing.c"
 }
 
 
@@ -3113,21 +3112,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 3089 "PicasaPublishing.c"
+#line 3088 "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 3096 "PicasaPublishing.c"
+#line 3095 "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 3103 "PicasaPublishing.c"
+#line 3102 "PicasaPublishing.c"
 }
 
 
@@ -3136,7 +3135,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 3112 "PicasaPublishing.c"
+#line 3111 "PicasaPublishing.c"
 	}
 }
 
@@ -3146,11 +3145,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 3122 "PicasaPublishing.c"
+#line 3121 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3126 "PicasaPublishing.c"
+#line 3125 "PicasaPublishing.c"
 	}
 }
 
@@ -3158,37 +3157,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 3134 "PicasaPublishing.c"
+#line 3133 "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 3141 "PicasaPublishing.c"
+#line 3140 "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 3148 "PicasaPublishing.c"
+#line 3147 "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 3152 "PicasaPublishing.c"
+#line 3151 "PicasaPublishing.c"
 		}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 3156 "PicasaPublishing.c"
+#line 3155 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3160 "PicasaPublishing.c"
+#line 3159 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3164 "PicasaPublishing.c"
+#line 3163 "PicasaPublishing.c"
 }
 
 
@@ -3199,25 +3198,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 3175 "PicasaPublishing.c"
+#line 3174 "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 3181 "PicasaPublishing.c"
+#line 3180 "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 3185 "PicasaPublishing.c"
+#line 3184 "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 3189 "PicasaPublishing.c"
+#line 3188 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3193 "PicasaPublishing.c"
+#line 3192 "PicasaPublishing.c"
 }
 
 
@@ -3231,7 +3230,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 3207 "PicasaPublishing.c"
+#line 3206 "PicasaPublishing.c"
 }
 
 
@@ -3240,7 +3239,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 3216 "PicasaPublishing.c"
+#line 3215 "PicasaPublishing.c"
 }
 
 
@@ -3260,17 +3259,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 3236 "PicasaPublishing.c"
+#line 3235 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3240 "PicasaPublishing.c"
+#line 3239 "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 3246 "PicasaPublishing.c"
+#line 3245 "PicasaPublishing.c"
 	}
 }
 
@@ -3289,17 +3288,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 3265 "PicasaPublishing.c"
+#line 3264 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3269 "PicasaPublishing.c"
+#line 3268 "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 3275 "PicasaPublishing.c"
+#line 3274 "PicasaPublishing.c"
 	}
 }
 
@@ -3309,14 +3308,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 3285 "PicasaPublishing.c"
+#line 3284 "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 3292 "PicasaPublishing.c"
+#line 3291 "PicasaPublishing.c"
 }
 
 
@@ -3330,7 +3329,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 3306 "PicasaPublishing.c"
+#line 3305 "PicasaPublishing.c"
 }
 
 
@@ -3355,7 +3354,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 3331 "PicasaPublishing.c"
+#line 3330 "PicasaPublishing.c"
 }
 
 
@@ -3368,7 +3367,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 3344 "PicasaPublishing.c"
+#line 3343 "PicasaPublishing.c"
 	}
 }
 
@@ -3384,14 +3383,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 3360 "PicasaPublishing.c"
+#line 3359 "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 3367 "PicasaPublishing.c"
+#line 3366 "PicasaPublishing.c"
 }
 
 
@@ -3419,7 +3418,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 3395 "PicasaPublishing.c"
+#line 3394 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -3429,7 +3428,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 3405 "PicasaPublishing.c"
+#line 3404 "PicasaPublishing.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_) {
@@ -3437,7 +3436,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 3413 "PicasaPublishing.c"
+#line 3412 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3446,7 +3445,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 3422 "PicasaPublishing.c"
+#line 3421 "PicasaPublishing.c"
 	}
 }
 
@@ -3454,7 +3453,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 3430 "PicasaPublishing.c"
+#line 3429 "PicasaPublishing.c"
 }
 
 
@@ -3504,11 +3503,11 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans
 	if (_tmp3_) {
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = "public";
-#line 3480 "PicasaPublishing.c"
+#line 3479 "PicasaPublishing.c"
 	} else {
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = "private";
-#line 3484 "PicasaPublishing.c"
+#line 3483 "PicasaPublishing.c"
 	}
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = parameters;
@@ -3536,21 +3535,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 3512 "PicasaPublishing.c"
+#line 3511 "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 3519 "PicasaPublishing.c"
+#line 3518 "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 3526 "PicasaPublishing.c"
+#line 3525 "PicasaPublishing.c"
 }
 
 
@@ -3573,14 +3572,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 3549 "PicasaPublishing.c"
+#line 3548 "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 3556 "PicasaPublishing.c"
+#line 3555 "PicasaPublishing.c"
 }
 
 
@@ -3658,11 +3657,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 3634 "PicasaPublishing.c"
+#line 3633 "PicasaPublishing.c"
 	} else {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp12_ = "image/jpeg";
-#line 3638 "PicasaPublishing.c"
+#line 3637 "PicasaPublishing.c"
 	}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = g_strdup (_tmp12_);
@@ -3672,14 +3671,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 3648 "PicasaPublishing.c"
+#line 3647 "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 3655 "PicasaPublishing.c"
+#line 3654 "PicasaPublishing.c"
 }
 
 
@@ -3690,39 +3689,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3678 "PicasaPublishing.c"
+#line 3677 "PicasaPublishing.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3686 "PicasaPublishing.c"
+#line 3685 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3698 "PicasaPublishing.c"
+#line 3697 "PicasaPublishing.c"
 	}
 }
 
@@ -3740,114 +3739,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3722 "PicasaPublishing.c"
+#line 3721 "PicasaPublishing.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3728 "PicasaPublishing.c"
+#line 3727 "PicasaPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3732 "PicasaPublishing.c"
+#line 3731 "PicasaPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3736 "PicasaPublishing.c"
+#line 3735 "PicasaPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3748 "PicasaPublishing.c"
+#line 3747 "PicasaPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3758 "PicasaPublishing.c"
+#line 3757 "PicasaPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3764 "PicasaPublishing.c"
+#line 3763 "PicasaPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3778 "PicasaPublishing.c"
+#line 3777 "PicasaPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3788 "PicasaPublishing.c"
+#line 3787 "PicasaPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3794 "PicasaPublishing.c"
+#line 3793 "PicasaPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3803 "PicasaPublishing.c"
+#line 3802 "PicasaPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3823 "PicasaPublishing.c"
+#line 3822 "PicasaPublishing.c"
 }
 
 
@@ -3858,74 +3857,74 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3840 "PicasaPublishing.c"
+#line 3839 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 3850 "PicasaPublishing.c"
+#line 3849 "PicasaPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 3860 "PicasaPublishing.c"
+#line 3859 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3866 "PicasaPublishing.c"
+#line 3865 "PicasaPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 3877 "PicasaPublishing.c"
+#line 3876 "PicasaPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 3889 "PicasaPublishing.c"
+#line 3888 "PicasaPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3893 "PicasaPublishing.c"
+#line 3892 "PicasaPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3897 "PicasaPublishing.c"
+#line 3896 "PicasaPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3901 "PicasaPublishing.c"
+#line 3900 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -3946,18 +3945,18 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 3924 "PicasaPublishing.c"
+#line 3923 "PicasaPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3933 "PicasaPublishing.c"
+#line 3932 "PicasaPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -3968,192 +3967,192 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 3946 "PicasaPublishing.c"
+#line 3945 "PicasaPublishing.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 3952 "PicasaPublishing.c"
+#line 3951 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 3962 "PicasaPublishing.c"
+#line 3961 "PicasaPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3974 "PicasaPublishing.c"
+#line 3973 "PicasaPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3978 "PicasaPublishing.c"
+#line 3977 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 3984 "PicasaPublishing.c"
+#line 3983 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 3995 "PicasaPublishing.c"
+#line 3994 "PicasaPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 4010 "PicasaPublishing.c"
+#line 4009 "PicasaPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 4014 "PicasaPublishing.c"
+#line 4013 "PicasaPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 4018 "PicasaPublishing.c"
+#line 4017 "PicasaPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4024 "PicasaPublishing.c"
+#line 4023 "PicasaPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 4036 "PicasaPublishing.c"
+#line 4035 "PicasaPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 4057 "PicasaPublishing.c"
+#line 4056 "PicasaPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 4061 "PicasaPublishing.c"
+#line 4060 "PicasaPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 4067 "PicasaPublishing.c"
+#line 4066 "PicasaPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 4074 "PicasaPublishing.c"
+#line 4073 "PicasaPublishing.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 4082 "PicasaPublishing.c"
+#line 4081 "PicasaPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 4120 "PicasaPublishing.c"
+#line 4119 "PicasaPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 4129 "PicasaPublishing.c"
+#line 4128 "PicasaPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -4167,96 +4166,96 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 4145 "PicasaPublishing.c"
+#line 4144 "PicasaPublishing.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 4151 "PicasaPublishing.c"
+#line 4150 "PicasaPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4165 "PicasaPublishing.c"
+#line 4164 "PicasaPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 4185 "PicasaPublishing.c"
+#line 4184 "PicasaPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 4200 "PicasaPublishing.c"
+#line 4199 "PicasaPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 4204 "PicasaPublishing.c"
+#line 4203 "PicasaPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 4212 "PicasaPublishing.c"
+#line 4211 "PicasaPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4223 "PicasaPublishing.c"
+#line 4222 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4232 "PicasaPublishing.c"
+#line 4231 "PicasaPublishing.c"
 	}
 }
 
@@ -4273,62 +4272,55 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 4277 "PicasaPublishing.c"
+#line 4276 "PicasaPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#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"
+#line 4282 "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 4297 "PicasaPublishing.c"
+#line 4289 "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 4304 "PicasaPublishing.c"
+#line 4296 "PicasaPublishing.c"
 }
 
 
@@ -4368,40 +4360,38 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	gint _tmp61__length1 = 0;
 	guint8* _tmp62_ = NULL;
 	gint _tmp62__length1 = 0;
-	guint8* _tmp63_ = NULL;
-	gint _tmp63__length1 = 0;
-	SoupBuffer* _tmp64_ = NULL;
-	SoupMultipart* _tmp65_ = NULL;
-	SoupBuffer* _tmp66_ = NULL;
+	SoupBuffer* _tmp63_ = NULL;
+	SoupMultipart* _tmp64_ = NULL;
+	SoupBuffer* _tmp65_ = NULL;
 	guint8* photo_data = NULL;
-	GMappedFile* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
+	GMappedFile* _tmp87_ = NULL;
+	gchar* _tmp88_ = NULL;
 	gint photo_data_length1 = 0;
 	gint _photo_data_size_ = 0;
-	GMappedFile* _tmp90_ = NULL;
-	gsize _tmp91_ = 0UL;
-	gint _tmp92_ = 0;
+	GMappedFile* _tmp89_ = NULL;
+	gsize _tmp90_ = 0UL;
+	gint _tmp91_ = 0;
 	SoupBuffer* bindable_data = NULL;
-	SoupBuffer* _tmp93_ = NULL;
-	SoupMultipart* _tmp94_ = NULL;
-	SpitPublishingPublishable* _tmp95_ = NULL;
+	SoupBuffer* _tmp92_ = NULL;
+	SoupMultipart* _tmp93_ = NULL;
+	SpitPublishingPublishable* _tmp94_ = NULL;
+	GFile* _tmp95_ = NULL;
 	GFile* _tmp96_ = NULL;
-	GFile* _tmp97_ = NULL;
+	gchar* _tmp97_ = NULL;
 	gchar* _tmp98_ = NULL;
-	gchar* _tmp99_ = NULL;
-	const gchar* _tmp100_ = NULL;
+	const gchar* _tmp99_ = NULL;
 	SoupMessage* outbound_message = NULL;
+	gchar* _tmp100_ = NULL;
 	gchar* _tmp101_ = NULL;
-	gchar* _tmp102_ = NULL;
-	SoupMultipart* _tmp103_ = NULL;
+	SoupMultipart* _tmp102_ = NULL;
+	SoupMessage* _tmp103_ = NULL;
 	SoupMessage* _tmp104_ = NULL;
-	SoupMessage* _tmp105_ = NULL;
-	SoupMessageHeaders* _tmp106_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp107_ = NULL;
+	SoupMessageHeaders* _tmp105_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp106_ = NULL;
+	gchar* _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);
@@ -4425,7 +4415,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 4401 "PicasaPublishing.c"
+#line 4391 "PicasaPublishing.c"
 		SpitPublishingPublishable* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -4452,7 +4442,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 4428 "PicasaPublishing.c"
+#line 4418 "PicasaPublishing.c"
 	}
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
@@ -4474,7 +4464,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 4450 "PicasaPublishing.c"
+#line 4440 "PicasaPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
@@ -4483,14 +4473,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 4459 "PicasaPublishing.c"
+#line 4449 "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 4466 "PicasaPublishing.c"
+#line 4456 "PicasaPublishing.c"
 					gint _tmp19_ = 0;
 					gchar** _tmp20_ = NULL;
 					gint _tmp20__length1 = 0;
@@ -4507,13 +4497,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 4483 "PicasaPublishing.c"
+#line 4473 "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 4489 "PicasaPublishing.c"
+#line 4479 "PicasaPublishing.c"
 					}
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -4527,7 +4517,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 4503 "PicasaPublishing.c"
+#line 4493 "PicasaPublishing.c"
 					}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
@@ -4541,7 +4531,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 4517 "PicasaPublishing.c"
+#line 4507 "PicasaPublishing.c"
 						gchar** _tmp25_ = NULL;
 						gint _tmp25__length1 = 0;
 						gint _tmp26_ = 0;
@@ -4574,7 +4564,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 4550 "PicasaPublishing.c"
+#line 4540 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp32_ = NULL;
 						gint _tmp32__length1 = 0;
@@ -4600,7 +4590,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 4576 "PicasaPublishing.c"
+#line 4566 "PicasaPublishing.c"
 					}
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp37_ = keywords_string;
@@ -4610,7 +4600,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 4586 "PicasaPublishing.c"
+#line 4576 "PicasaPublishing.c"
 						const gchar* _tmp40_ = NULL;
 						gchar** _tmp41_ = NULL;
 						gint _tmp41__length1 = 0;
@@ -4635,7 +4625,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 4611 "PicasaPublishing.c"
+#line 4601 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp45_ = NULL;
 						gint _tmp45__length1 = 0;
@@ -4650,11 +4640,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 4626 "PicasaPublishing.c"
+#line 4616 "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 4630 "PicasaPublishing.c"
+#line 4620 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -4674,7 +4664,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 4650 "PicasaPublishing.c"
+#line 4640 "PicasaPublishing.c"
 	}
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp51_ = self->priv->publishable;
@@ -4709,55 +4699,51 @@ 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_ = (_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;
+	_tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp64_ = soup_buffer_new_take (_tmp63_, _tmp63__length1);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	metadata_buffer = _tmp64_;
+	metadata_buffer = _tmp63_;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp65_ = message_parts;
+	_tmp64_ = message_parts;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp66_ = metadata_buffer;
+	_tmp65_ = metadata_buffer;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp65_, "", "", "application/atom+xml", _tmp66_);
-#line 4698 "PicasaPublishing.c"
+	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
+#line 4684 "PicasaPublishing.c"
 	{
-		GMappedFile* _tmp67_ = NULL;
-		SpitPublishingPublishable* _tmp68_ = NULL;
+		GMappedFile* _tmp66_ = NULL;
+		SpitPublishingPublishable* _tmp67_ = NULL;
+		GFile* _tmp68_ = NULL;
 		GFile* _tmp69_ = NULL;
-		GFile* _tmp70_ = NULL;
+		gchar* _tmp70_ = NULL;
 		gchar* _tmp71_ = NULL;
-		gchar* _tmp72_ = NULL;
+		GMappedFile* _tmp72_ = NULL;
 		GMappedFile* _tmp73_ = NULL;
 		GMappedFile* _tmp74_ = NULL;
-		GMappedFile* _tmp75_ = NULL;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp68_ = self->priv->publishable;
+		_tmp67_ = self->priv->publishable;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
+		_tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = _tmp69_;
+		_tmp69_ = _tmp68_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp71_ = g_file_get_path (_tmp70_);
+		_tmp70_ = g_file_get_path (_tmp69_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp72_ = _tmp71_;
+		_tmp71_ = _tmp70_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp73_ = g_mapped_file_new (_tmp72_, FALSE, &_inner_error_);
+		_tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp74_ = _tmp73_;
+		_tmp73_ = _tmp72_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp72_);
+		_g_free0 (_tmp71_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp70_);
+		_g_object_unref0 (_tmp69_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = _tmp74_;
+		_tmp66_ = _tmp73_;
 #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 4733 "PicasaPublishing.c"
+#line 4719 "PicasaPublishing.c"
 				goto __catch14_g_file_error;
 			}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4778,80 +4764,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 4754 "PicasaPublishing.c"
+#line 4740 "PicasaPublishing.c"
 		}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp75_ = _tmp67_;
+		_tmp74_ = _tmp66_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = NULL;
+		_tmp66_ = 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 = _tmp75_;
+		self->priv->mapped_file = _tmp74_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_mapped_file_unref0 (_tmp67_);
-#line 4766 "PicasaPublishing.c"
+		_g_mapped_file_unref0 (_tmp66_);
+#line 4752 "PicasaPublishing.c"
 	}
 	goto __finally14;
 	__catch14_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp76_ = NULL;
+		SpitPublishingPublishable* _tmp75_ = NULL;
+		GFile* _tmp76_ = NULL;
 		GFile* _tmp77_ = NULL;
-		GFile* _tmp78_ = NULL;
+		gchar* _tmp78_ = NULL;
 		gchar* _tmp79_ = NULL;
-		gchar* _tmp80_ = NULL;
-		GError* _tmp81_ = NULL;
-		const gchar* _tmp82_ = NULL;
+		GError* _tmp80_ = NULL;
+		const gchar* _tmp81_ = NULL;
+		gchar* _tmp82_ = NULL;
 		gchar* _tmp83_ = NULL;
-		gchar* _tmp84_ = NULL;
+		const gchar* _tmp84_ = NULL;
 		const gchar* _tmp85_ = NULL;
-		const gchar* _tmp86_ = NULL;
-		GError* _tmp87_ = NULL;
+		GError* _tmp86_ = 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"
-		_tmp76_ = self->priv->publishable;
+		_tmp75_ = self->priv->publishable;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp77_ = spit_publishing_publishable_get_serialized_file (_tmp76_);
+		_tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp78_ = _tmp77_;
+		_tmp77_ = _tmp76_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp79_ = g_file_get_path (_tmp78_);
+		_tmp78_ = g_file_get_path (_tmp77_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp80_ = _tmp79_;
+		_tmp79_ = _tmp78_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp81_ = e;
+		_tmp80_ = e;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp82_ = _tmp81_->message;
+		_tmp81_ = _tmp80_->message;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp83_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp80_, _tmp82_);
+		_tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp84_ = _tmp83_;
+		_tmp83_ = _tmp82_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp80_);
+		_g_free0 (_tmp79_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp78_);
+		_g_object_unref0 (_tmp77_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		msg = _tmp84_;
+		msg = _tmp83_;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp85_ = msg;
+		_tmp84_ = msg;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:574: %s", _tmp85_);
+		g_warning ("PicasaPublishing.vala:574: %s", _tmp84_);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp86_ = msg;
+		_tmp85_ = msg;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp87_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp86_);
+		_tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = _tmp87_;
+		_inner_error_ = _tmp86_;
 #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 4827 "PicasaPublishing.c"
+#line 4813 "PicasaPublishing.c"
 		goto __finally14;
 	}
 	__finally14:
@@ -4875,7 +4861,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 4851 "PicasaPublishing.c"
+#line 4837 "PicasaPublishing.c"
 		} else {
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4895,83 +4881,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 4871 "PicasaPublishing.c"
+#line 4857 "PicasaPublishing.c"
 		}
 	}
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp88_ = self->priv->mapped_file;
+	_tmp87_ = self->priv->mapped_file;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp89_ = g_mapped_file_get_contents (_tmp88_);
+	_tmp88_ = g_mapped_file_get_contents (_tmp87_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data = (guint8*) _tmp89_;
+	photo_data = (guint8*) _tmp88_;
 #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"
-	_tmp90_ = self->priv->mapped_file;
+	_tmp89_ = self->priv->mapped_file;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp91_ = g_mapped_file_get_length (_tmp90_);
+	_tmp90_ = g_mapped_file_get_length (_tmp89_);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data_length1 = (gint) _tmp91_;
+	photo_data_length1 = (gint) _tmp90_;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp92_ = photo_data_length1;
+	_tmp91_ = photo_data_length1;
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp93_ = soup_buffer_new_with_owner (photo_data, photo_data_length1, self, NULL);
+	_tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	bindable_data = _tmp93_;
+	bindable_data = _tmp92_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp94_ = message_parts;
+	_tmp93_ = message_parts;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp95_ = self->priv->publishable;
+	_tmp94_ = self->priv->publishable;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp96_ = spit_publishing_publishable_get_serialized_file (_tmp95_);
+	_tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp97_ = _tmp96_;
+	_tmp96_ = _tmp95_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp98_ = g_file_get_path (_tmp97_);
+	_tmp97_ = g_file_get_path (_tmp96_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp99_ = _tmp98_;
+	_tmp98_ = _tmp97_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp100_ = self->priv->mime_type;
+	_tmp99_ = self->priv->mime_type;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp94_, "", _tmp99_, _tmp100_, bindable_data);
+	soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp99_);
+	_g_free0 (_tmp98_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (_tmp97_);
+	_g_object_unref0 (_tmp96_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp101_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp100_ = 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"
-	_tmp102_ = _tmp101_;
+	_tmp101_ = _tmp100_;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp103_ = message_parts;
+	_tmp102_ = message_parts;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp104_ = soup_form_request_new_from_multipart (_tmp102_, _tmp103_);
+	_tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp105_ = _tmp104_;
+	_tmp104_ = _tmp103_;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp102_);
+	_g_free0 (_tmp101_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	outbound_message = _tmp105_;
+	outbound_message = _tmp104_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp106_ = outbound_message->request_headers;
+	_tmp105_ = outbound_message->request_headers;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp107_ = self->priv->session;
+	_tmp106_ = self->priv->session;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp108_ = publishing_rest_support_google_session_get_access_token (_tmp107_);
+	_tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp109_ = _tmp108_;
+	_tmp108_ = _tmp107_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp110_ = g_strconcat ("Bearer ", _tmp109_, NULL);
+	_tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp111_ = _tmp110_;
+	_tmp110_ = _tmp109_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_message_headers_append (_tmp106_, "Authorization", _tmp111_);
+	soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp111_);
+	_g_free0 (_tmp110_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp109_);
+	_g_free0 (_tmp108_);
 #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"
@@ -5002,7 +4988,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 4978 "PicasaPublishing.c"
+#line 4964 "PicasaPublishing.c"
 		} else {
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
@@ -5026,7 +5012,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 5002 "PicasaPublishing.c"
+#line 4988 "PicasaPublishing.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5045,7 +5031,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 5021 "PicasaPublishing.c"
+#line 5007 "PicasaPublishing.c"
 }
 
 
@@ -5058,14 +5044,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 5034 "PicasaPublishing.c"
+#line 5020 "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 5041 "PicasaPublishing.c"
+#line 5027 "PicasaPublishing.c"
 }
 
 
@@ -5085,7 +5071,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 5061 "PicasaPublishing.c"
+#line 5047 "PicasaPublishing.c"
 }
 
 
@@ -5104,42 +5090,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 5080 "PicasaPublishing.c"
+#line 5066 "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 5087 "PicasaPublishing.c"
+#line 5073 "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 5094 "PicasaPublishing.c"
+#line 5080 "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 5101 "PicasaPublishing.c"
+#line 5087 "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 5108 "PicasaPublishing.c"
+#line 5094 "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 5115 "PicasaPublishing.c"
+#line 5101 "PicasaPublishing.c"
 }
 
 
@@ -5411,7 +5397,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 5387 "PicasaPublishing.c"
+#line 5373 "PicasaPublishing.c"
 		GtkLabel* _tmp59_ = NULL;
 		const gchar* _tmp60_ = NULL;
 		GtkComboBoxText* _tmp61_ = NULL;
@@ -5430,7 +5416,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 5406 "PicasaPublishing.c"
+#line 5392 "PicasaPublishing.c"
 	} else {
 		GtkLabel* _tmp63_ = NULL;
 		const gchar* _tmp64_ = NULL;
@@ -5451,7 +5437,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 5427 "PicasaPublishing.c"
+#line 5413 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
@@ -5463,14 +5449,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 5439 "PicasaPublishing.c"
+#line 5425 "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 5446 "PicasaPublishing.c"
+#line 5432 "PicasaPublishing.c"
 				{
 					GtkComboBoxText* _tmp67_ = NULL;
 					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL;
@@ -5485,7 +5471,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 5461 "PicasaPublishing.c"
+#line 5447 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -5505,7 +5491,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 5481 "PicasaPublishing.c"
+#line 5467 "PicasaPublishing.c"
 	}
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp75_ = self->priv->use_existing_radio;
@@ -5529,14 +5515,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 5505 "PicasaPublishing.c"
+#line 5491 "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 5512 "PicasaPublishing.c"
+#line 5498 "PicasaPublishing.c"
 }
 
 
@@ -5572,7 +5558,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 5548 "PicasaPublishing.c"
+#line 5534 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5581,11 +5567,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 5557 "PicasaPublishing.c"
+#line 5543 "PicasaPublishing.c"
 	} else {
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 5561 "PicasaPublishing.c"
+#line 5547 "PicasaPublishing.c"
 	}
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
@@ -5633,7 +5619,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 5609 "PicasaPublishing.c"
+#line 5595 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
@@ -5663,7 +5649,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 5639 "PicasaPublishing.c"
+#line 5625 "PicasaPublishing.c"
 	} else {
 		PublishingPicasaPublishingParameters* _tmp27_ = NULL;
 		PublishingPicasaAlbum** _tmp28_ = NULL;
@@ -5718,11 +5704,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 5694 "PicasaPublishing.c"
+#line 5680 "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 5698 "PicasaPublishing.c"
+#line 5684 "PicasaPublishing.c"
 }
 
 
@@ -5751,7 +5737,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 5727 "PicasaPublishing.c"
+#line 5713 "PicasaPublishing.c"
 }
 
 
@@ -5780,7 +5766,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 5756 "PicasaPublishing.c"
+#line 5742 "PicasaPublishing.c"
 }
 
 
@@ -5789,7 +5775,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 5765 "PicasaPublishing.c"
+#line 5751 "PicasaPublishing.c"
 }
 
 
@@ -5798,21 +5784,21 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5788 "PicasaPublishing.c"
+#line 5774 "PicasaPublishing.c"
 }
 
 
@@ -5849,7 +5835,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 5825 "PicasaPublishing.c"
+#line 5811 "PicasaPublishing.c"
 		GtkRadioButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5858,11 +5844,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 5834 "PicasaPublishing.c"
+#line 5820 "PicasaPublishing.c"
 	} else {
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = FALSE;
-#line 5838 "PicasaPublishing.c"
+#line 5824 "PicasaPublishing.c"
 	}
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = self->priv->publish_button;
@@ -5870,7 +5856,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 5846 "PicasaPublishing.c"
+#line 5832 "PicasaPublishing.c"
 }
 
 
@@ -5879,7 +5865,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 5855 "PicasaPublishing.c"
+#line 5841 "PicasaPublishing.c"
 }
 
 
@@ -5890,13 +5876,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 5866 "PicasaPublishing.c"
+#line 5852 "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 5872 "PicasaPublishing.c"
+#line 5858 "PicasaPublishing.c"
 }
 
 
@@ -5907,13 +5893,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 5883 "PicasaPublishing.c"
+#line 5869 "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 5889 "PicasaPublishing.c"
+#line 5875 "PicasaPublishing.c"
 }
 
 
@@ -5924,13 +5910,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 5900 "PicasaPublishing.c"
+#line 5886 "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 5906 "PicasaPublishing.c"
+#line 5892 "PicasaPublishing.c"
 }
 
 
@@ -5941,13 +5927,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 5917 "PicasaPublishing.c"
+#line 5903 "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 5923 "PicasaPublishing.c"
+#line 5909 "PicasaPublishing.c"
 }
 
 
@@ -5958,13 +5944,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 5934 "PicasaPublishing.c"
+#line 5920 "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 5940 "PicasaPublishing.c"
+#line 5926 "PicasaPublishing.c"
 }
 
 
@@ -6064,13 +6050,13 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 	if (result_length1) {
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 6040 "PicasaPublishing.c"
+#line 6026 "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 6046 "PicasaPublishing.c"
+#line 6032 "PicasaPublishing.c"
 }
 
 
@@ -6107,19 +6093,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 6083 "PicasaPublishing.c"
+#line 6069 "PicasaPublishing.c"
 	{
 		gint i = 0;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 6088 "PicasaPublishing.c"
+#line 6074 "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 6095 "PicasaPublishing.c"
+#line 6081 "PicasaPublishing.c"
 				gint _tmp7_ = 0;
 				PublishingPicasaAlbum** _tmp8_ = NULL;
 				gint _tmp8__length1 = 0;
@@ -6138,13 +6124,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 6114 "PicasaPublishing.c"
+#line 6100 "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 6120 "PicasaPublishing.c"
+#line 6106 "PicasaPublishing.c"
 				}
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
@@ -6158,7 +6144,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 6134 "PicasaPublishing.c"
+#line 6120 "PicasaPublishing.c"
 				}
 #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
@@ -6190,7 +6176,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 6166 "PicasaPublishing.c"
+#line 6152 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
 					PublishingPicasaAlbum** _tmp21_ = NULL;
@@ -6210,31 +6196,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 6186 "PicasaPublishing.c"
+#line 6172 "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 6192 "PicasaPublishing.c"
+#line 6178 "PicasaPublishing.c"
 					} else {
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 6196 "PicasaPublishing.c"
+#line 6182 "PicasaPublishing.c"
 					}
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 6200 "PicasaPublishing.c"
+#line 6186 "PicasaPublishing.c"
 				}
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 6204 "PicasaPublishing.c"
+#line 6190 "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 6210 "PicasaPublishing.c"
+#line 6196 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -6245,7 +6231,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 6221 "PicasaPublishing.c"
+#line 6207 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp28_ = NULL;
 		GtkRadioButton* _tmp29_ = NULL;
 		GtkRadioButton* _tmp30_ = NULL;
@@ -6271,14 +6257,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 6247 "PicasaPublishing.c"
+#line 6233 "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 6254 "PicasaPublishing.c"
+#line 6240 "PicasaPublishing.c"
 			GtkRadioButton* _tmp34_ = NULL;
 			GtkComboBoxText* _tmp35_ = NULL;
 			gint _tmp36_ = 0;
@@ -6302,7 +6288,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 6278 "PicasaPublishing.c"
+#line 6264 "PicasaPublishing.c"
 		} else {
 			GtkRadioButton* _tmp39_ = NULL;
 			GtkComboBoxText* _tmp40_ = NULL;
@@ -6329,7 +6315,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 6305 "PicasaPublishing.c"
+#line 6291 "PicasaPublishing.c"
 		}
 	}
 #line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6338,7 +6324,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 6314 "PicasaPublishing.c"
+#line 6300 "PicasaPublishing.c"
 }
 
 
@@ -6357,7 +6343,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 6333 "PicasaPublishing.c"
+#line 6319 "PicasaPublishing.c"
 }
 
 
@@ -6370,7 +6356,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 6346 "PicasaPublishing.c"
+#line 6332 "PicasaPublishing.c"
 }
 
 
@@ -6380,7 +6366,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 6356 "PicasaPublishing.c"
+#line 6342 "PicasaPublishing.c"
 }
 
 
@@ -6388,7 +6374,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 6364 "PicasaPublishing.c"
+#line 6350 "PicasaPublishing.c"
 }
 
 
@@ -6415,21 +6401,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 6391 "PicasaPublishing.c"
+#line 6377 "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 6398 "PicasaPublishing.c"
+#line 6384 "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 6405 "PicasaPublishing.c"
+#line 6391 "PicasaPublishing.c"
 }
 
 
@@ -6438,7 +6424,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 6414 "PicasaPublishing.c"
+#line 6400 "PicasaPublishing.c"
 	}
 }
 
@@ -6448,11 +6434,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 6424 "PicasaPublishing.c"
+#line 6410 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6428 "PicasaPublishing.c"
+#line 6414 "PicasaPublishing.c"
 	}
 }
 
@@ -6460,37 +6446,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 6436 "PicasaPublishing.c"
+#line 6422 "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 6443 "PicasaPublishing.c"
+#line 6429 "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 6450 "PicasaPublishing.c"
+#line 6436 "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 6454 "PicasaPublishing.c"
+#line 6440 "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 6458 "PicasaPublishing.c"
+#line 6444 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6462 "PicasaPublishing.c"
+#line 6448 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6466 "PicasaPublishing.c"
+#line 6452 "PicasaPublishing.c"
 }
 
 
@@ -6501,25 +6487,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 6477 "PicasaPublishing.c"
+#line 6463 "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 6483 "PicasaPublishing.c"
+#line 6469 "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 6487 "PicasaPublishing.c"
+#line 6473 "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 6491 "PicasaPublishing.c"
+#line 6477 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6495 "PicasaPublishing.c"
+#line 6481 "PicasaPublishing.c"
 }
 
 
@@ -6533,7 +6519,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 6509 "PicasaPublishing.c"
+#line 6495 "PicasaPublishing.c"
 }
 
 
@@ -6542,7 +6528,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 6518 "PicasaPublishing.c"
+#line 6504 "PicasaPublishing.c"
 }
 
 
@@ -6562,17 +6548,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 6538 "PicasaPublishing.c"
+#line 6524 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6542 "PicasaPublishing.c"
+#line 6528 "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 6548 "PicasaPublishing.c"
+#line 6534 "PicasaPublishing.c"
 	}
 }
 
@@ -6591,17 +6577,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 6567 "PicasaPublishing.c"
+#line 6553 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6571 "PicasaPublishing.c"
+#line 6557 "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 6577 "PicasaPublishing.c"
+#line 6563 "PicasaPublishing.c"
 	}
 }
 
@@ -6611,14 +6597,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 6587 "PicasaPublishing.c"
+#line 6573 "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 6594 "PicasaPublishing.c"
+#line 6580 "PicasaPublishing.c"
 }
 
 
@@ -6630,7 +6616,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 6606 "PicasaPublishing.c"
+#line 6592 "PicasaPublishing.c"
 }
 
 
@@ -6655,7 +6641,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 6631 "PicasaPublishing.c"
+#line 6617 "PicasaPublishing.c"
 }
 
 
@@ -6668,7 +6654,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 6644 "PicasaPublishing.c"
+#line 6630 "PicasaPublishing.c"
 	}
 }
 
@@ -6684,7 +6670,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 6660 "PicasaPublishing.c"
+#line 6646 "PicasaPublishing.c"
 }
 
 
@@ -6699,7 +6685,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 6675 "PicasaPublishing.c"
+#line 6661 "PicasaPublishing.c"
 }
 
 
@@ -6732,7 +6718,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 6708 "PicasaPublishing.c"
+#line 6694 "PicasaPublishing.c"
 }
 
 
@@ -6772,7 +6758,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 6748 "PicasaPublishing.c"
+#line 6734 "PicasaPublishing.c"
 }
 
 
@@ -6831,14 +6817,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 6807 "PicasaPublishing.c"
+#line 6793 "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 6814 "PicasaPublishing.c"
+#line 6800 "PicasaPublishing.c"
 }
 
 
@@ -6853,7 +6839,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 6829 "PicasaPublishing.c"
+#line 6815 "PicasaPublishing.c"
 }
 
 
@@ -6865,7 +6851,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 6841 "PicasaPublishing.c"
+#line 6827 "PicasaPublishing.c"
 }
 
 
@@ -6877,7 +6863,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 6853 "PicasaPublishing.c"
+#line 6839 "PicasaPublishing.c"
 }
 
 
@@ -6892,7 +6878,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 6868 "PicasaPublishing.c"
+#line 6854 "PicasaPublishing.c"
 }
 
 
@@ -6910,7 +6896,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 6886 "PicasaPublishing.c"
+#line 6872 "PicasaPublishing.c"
 }
 
 
@@ -6929,7 +6915,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 6905 "PicasaPublishing.c"
+#line 6891 "PicasaPublishing.c"
 }
 
 
@@ -6948,7 +6934,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 6924 "PicasaPublishing.c"
+#line 6910 "PicasaPublishing.c"
 }
 
 
@@ -6966,20 +6952,20 @@ 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 6942 "PicasaPublishing.c"
+#line 6928 "PicasaPublishing.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 6955 "PicasaPublishing.c"
+#line 6941 "PicasaPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6992,100 +6978,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6986 "PicasaPublishing.c"
+#line 6972 "PicasaPublishing.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6995 "PicasaPublishing.c"
+#line 6981 "PicasaPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7011 "PicasaPublishing.c"
+#line 6997 "PicasaPublishing.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7022 "PicasaPublishing.c"
+#line 7008 "PicasaPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7036 "PicasaPublishing.c"
+#line 7022 "PicasaPublishing.c"
 	}
 	goto __finally15;
 	__catch15_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7050 "PicasaPublishing.c"
+#line 7036 "PicasaPublishing.c"
 	}
 	__finally15:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7061 "PicasaPublishing.c"
+#line 7047 "PicasaPublishing.c"
 	}
 }
 
@@ -7112,7 +7098,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 7088 "PicasaPublishing.c"
+#line 7074 "PicasaPublishing.c"
 }
 
 
@@ -7130,7 +7116,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 7106 "PicasaPublishing.c"
+#line 7092 "PicasaPublishing.c"
 }
 
 
@@ -7149,35 +7135,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 7125 "PicasaPublishing.c"
+#line 7111 "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 7132 "PicasaPublishing.c"
+#line 7118 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup5 (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 7143 "PicasaPublishing.c"
+#line 7129 "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 7149 "PicasaPublishing.c"
+#line 7135 "PicasaPublishing.c"
 	}
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7153 "PicasaPublishing.c"
+#line 7139 "PicasaPublishing.c"
 }
 
 
@@ -7196,7 +7182,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_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_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"
@@ -7207,34 +7193,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 7183 "PicasaPublishing.c"
+#line 7169 "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 7189 "PicasaPublishing.c"
+#line 7175 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup6 (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 7200 "PicasaPublishing.c"
+#line 7186 "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 7206 "PicasaPublishing.c"
+#line 7192 "PicasaPublishing.c"
 	}
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7210 "PicasaPublishing.c"
+#line 7196 "PicasaPublishing.c"
 }
 
 
@@ -7250,7 +7236,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_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_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"
@@ -7261,7 +7247,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 7237 "PicasaPublishing.c"
+#line 7223 "PicasaPublishing.c"
 }
 
 
@@ -7273,7 +7259,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 7249 "PicasaPublishing.c"
+#line 7235 "PicasaPublishing.c"
 }
 
 
@@ -7288,7 +7274,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 7264 "PicasaPublishing.c"
+#line 7250 "PicasaPublishing.c"
 }
 
 
@@ -7300,7 +7286,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 7276 "PicasaPublishing.c"
+#line 7262 "PicasaPublishing.c"
 }
 
 
@@ -7315,7 +7301,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 7291 "PicasaPublishing.c"
+#line 7277 "PicasaPublishing.c"
 }
 
 
@@ -7327,7 +7313,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 7303 "PicasaPublishing.c"
+#line 7289 "PicasaPublishing.c"
 }
 
 
@@ -7342,7 +7328,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 7318 "PicasaPublishing.c"
+#line 7304 "PicasaPublishing.c"
 }
 
 
@@ -7354,7 +7340,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 7330 "PicasaPublishing.c"
+#line 7316 "PicasaPublishing.c"
 }
 
 
@@ -7369,14 +7355,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
 	result = _tmp0_;
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7345 "PicasaPublishing.c"
+#line 7331 "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 7352 "PicasaPublishing.c"
+#line 7338 "PicasaPublishing.c"
 }
 
 
@@ -7385,7 +7371,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 7361 "PicasaPublishing.c"
+#line 7347 "PicasaPublishing.c"
 	}
 }
 
@@ -7395,11 +7381,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 7371 "PicasaPublishing.c"
+#line 7357 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7375 "PicasaPublishing.c"
+#line 7361 "PicasaPublishing.c"
 	}
 }
 
@@ -7407,37 +7393,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 7383 "PicasaPublishing.c"
+#line 7369 "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 7390 "PicasaPublishing.c"
+#line 7376 "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 7397 "PicasaPublishing.c"
+#line 7383 "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 7401 "PicasaPublishing.c"
+#line 7387 "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 7405 "PicasaPublishing.c"
+#line 7391 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7409 "PicasaPublishing.c"
+#line 7395 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7413 "PicasaPublishing.c"
+#line 7399 "PicasaPublishing.c"
 }
 
 
@@ -7448,25 +7434,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 7424 "PicasaPublishing.c"
+#line 7410 "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 7430 "PicasaPublishing.c"
+#line 7416 "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 7434 "PicasaPublishing.c"
+#line 7420 "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 7438 "PicasaPublishing.c"
+#line 7424 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7442 "PicasaPublishing.c"
+#line 7428 "PicasaPublishing.c"
 }
 
 
@@ -7480,7 +7466,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 7456 "PicasaPublishing.c"
+#line 7442 "PicasaPublishing.c"
 }
 
 
@@ -7489,7 +7475,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 7465 "PicasaPublishing.c"
+#line 7451 "PicasaPublishing.c"
 }
 
 
@@ -7509,17 +7495,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 7485 "PicasaPublishing.c"
+#line 7471 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7489 "PicasaPublishing.c"
+#line 7475 "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 7495 "PicasaPublishing.c"
+#line 7481 "PicasaPublishing.c"
 	}
 }
 
@@ -7538,17 +7524,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 7514 "PicasaPublishing.c"
+#line 7500 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7518 "PicasaPublishing.c"
+#line 7504 "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 7524 "PicasaPublishing.c"
+#line 7510 "PicasaPublishing.c"
 	}
 }
 
@@ -7560,7 +7546,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 7536 "PicasaPublishing.c"
+#line 7522 "PicasaPublishing.c"
 }
 
 
@@ -7569,7 +7555,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 7545 "PicasaPublishing.c"
+#line 7531 "PicasaPublishing.c"
 }
 
 
@@ -7587,7 +7573,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 7563 "PicasaPublishing.c"
+#line 7549 "PicasaPublishing.c"
 }
 
 
@@ -7612,7 +7598,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 7588 "PicasaPublishing.c"
+#line 7574 "PicasaPublishing.c"
 }
 
 
@@ -7625,7 +7611,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 7601 "PicasaPublishing.c"
+#line 7587 "PicasaPublishing.c"
 	}
 }
 
@@ -7659,14 +7645,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 7635 "PicasaPublishing.c"
+#line 7621 "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 7642 "PicasaPublishing.c"
+#line 7628 "PicasaPublishing.c"
 }
 
 
@@ -7706,7 +7692,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	result = _tmp6_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7682 "PicasaPublishing.c"
+#line 7668 "PicasaPublishing.c"
 }
 
 
@@ -7719,14 +7705,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 7695 "PicasaPublishing.c"
+#line 7681 "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 7702 "PicasaPublishing.c"
+#line 7688 "PicasaPublishing.c"
 }
 
 
@@ -7738,7 +7724,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 7714 "PicasaPublishing.c"
+#line 7700 "PicasaPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index facbd1b..621ae12 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);
-        var metadata_buffer = new Soup.Buffer.take (metadata.data);
+        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, 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.
-        var bindable_data = new Soup.Buffer.with_owner (photo_data, this, null);
+        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, photo_data);
 
         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 8d06afe..820936f 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -1,4 +1,4 @@
-/* PiwigoPublishing.c generated by valac 0.32.1, the Vala compiler
+/* PiwigoPublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from PiwigoPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -583,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_dup13 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup10 (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);
@@ -846,7 +846,7 @@ enum  {
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES,
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT
 };
-static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length);
+static PublishingPiwigoCategory** _vala_array_dup11 (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);
@@ -1042,7 +1042,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static GdkPixbuf** _vala_array_dup13 (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/PiwigoPublishing.vala"
@@ -1132,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_dup13 (_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/PiwigoPublishing.vala"
 	_tmp9__length1 = _tmp8__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5655,19 +5655,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 5664 "PiwigoPublishing.c"
 }
@@ -8277,7 +8277,7 @@ static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
 }
 
 
-static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length) {
+static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
 	PublishingPiwigoCategory** result;
 	int i;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8343,7 +8343,7 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane
 #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_);
+	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup11 (_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"
@@ -12238,72 +12238,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 12233 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 12243 "PiwigoPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 12253 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 12259 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 12270 "PiwigoPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 12282 "PiwigoPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 12286 "PiwigoPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 12290 "PiwigoPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 12294 "PiwigoPublishing.c"
 		gint i = 0;
@@ -12326,16 +12326,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 12317 "PiwigoPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 12326 "PiwigoPublishing.c"
 				gboolean _tmp11_ = FALSE;
@@ -12348,97 +12348,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 12339 "PiwigoPublishing.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 12345 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 12355 "PiwigoPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 12367 "PiwigoPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 12371 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 12377 "PiwigoPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 12388 "PiwigoPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 12403 "PiwigoPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 12407 "PiwigoPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 12411 "PiwigoPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 12417 "PiwigoPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 12429 "PiwigoPublishing.c"
 					gchar** _tmp25_ = NULL;
@@ -12447,91 +12447,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 12450 "PiwigoPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 12454 "PiwigoPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 12460 "PiwigoPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 12467 "PiwigoPublishing.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 12475 "PiwigoPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 12513 "PiwigoPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 12522 "PiwigoPublishing.c"
 				gint _tmp48_ = 0;
@@ -12547,94 +12547,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 12538 "PiwigoPublishing.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 12544 "PiwigoPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 12558 "PiwigoPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 12578 "PiwigoPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 12593 "PiwigoPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 12597 "PiwigoPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 12605 "PiwigoPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 12616 "PiwigoPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 12625 "PiwigoPublishing.c"
 	}
@@ -12686,30 +12686,31 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	gchar* comment = NULL;
 	SpitPublishingPublishable* _tmp34_ = NULL;
 	gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp53_ = NULL;
-	PublishingPiwigoCategory* _tmp54_ = NULL;
-	gint _tmp55_ = 0;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp58_ = NULL;
-	PublishingPiwigoPermissionLevel* _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	PublishingPiwigoPublishingParameters* _tmp63_ = NULL;
-	gboolean _tmp64_ = FALSE;
+	gboolean _tmp36_ = FALSE;
+	const gchar* _tmp37_ = NULL;
+	PublishingPiwigoPublishingParameters* _tmp55_ = NULL;
+	PublishingPiwigoCategory* _tmp56_ = NULL;
+	gint _tmp57_ = 0;
+	gchar* _tmp58_ = NULL;
+	gchar* _tmp59_ = NULL;
+	PublishingPiwigoPublishingParameters* _tmp60_ = NULL;
+	PublishingPiwigoPermissionLevel* _tmp61_ = NULL;
+	gint _tmp62_ = 0;
+	gchar* _tmp63_ = NULL;
+	gchar* _tmp64_ = NULL;
+	PublishingPiwigoPublishingParameters* _tmp65_ = NULL;
+	gboolean _tmp66_ = FALSE;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp67_ = NULL;
-	GEqualFunc _tmp68_ = NULL;
-	GHashTable* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	SpitPublishingPublishable* _tmp71_ = NULL;
+	GHashFunc _tmp69_ = NULL;
+	GEqualFunc _tmp70_ = NULL;
+	GHashTable* _tmp71_ = NULL;
 	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
+	SpitPublishingPublishable* _tmp73_ = NULL;
 	gchar* _tmp74_ = NULL;
 	gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
+	gchar* _tmp77_ = NULL;
+	gchar* _tmp78_ = NULL;
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12736,7 +12737,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 12725 "PiwigoPublishing.c"
+#line 12726 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -12758,7 +12759,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (_tmp11_);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 12747 "PiwigoPublishing.c"
+#line 12748 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
@@ -12788,7 +12789,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp18__length1 = keywords_length1;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp18_ != NULL) {
-#line 12777 "PiwigoPublishing.c"
+#line 12778 "PiwigoPublishing.c"
 		gchar** _tmp19_ = NULL;
 		gint _tmp19__length1 = 0;
 		gchar* _tmp20_ = NULL;
@@ -12802,7 +12803,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (tags);
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		tags = _tmp20_;
-#line 12791 "PiwigoPublishing.c"
+#line 12792 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
@@ -12846,191 +12847,204 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 #line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	comment = _tmp35_;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp36_ = name;
+	_tmp37_ = name;
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp37_ == NULL) {
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp36_ = TRUE;
+#line 12840 "PiwigoPublishing.c"
+	} else {
+		const gchar* _tmp38_ = NULL;
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp38_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (g_strcmp0 (_tmp36_, "") != 0) {
-#line 12837 "PiwigoPublishing.c"
-		SpitPublishingPublishable* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-		gboolean _tmp40_ = FALSE;
+		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
+#line 12847 "PiwigoPublishing.c"
+	}
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp36_) {
+#line 12851 "PiwigoPublishing.c"
+		SpitPublishingPublishable* _tmp39_ = NULL;
+		gchar* _tmp40_ = NULL;
 		const gchar* _tmp41_ = NULL;
+		gboolean _tmp42_ = FALSE;
+		const gchar* _tmp43_ = NULL;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp37_ = publishable;
+		_tmp39_ = publishable;
 #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);
+		_tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		name = _tmp38_;
+		name = _tmp40_;
 #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp39_ = name;
+		_tmp41_ = name;
 #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_);
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp41_);
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp41_ = comment;
+		_tmp43_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp41_ != NULL) {
-#line 12859 "PiwigoPublishing.c"
-			const gchar* _tmp42_ = NULL;
+		if (_tmp43_ != NULL) {
+#line 12873 "PiwigoPublishing.c"
+			const gchar* _tmp44_ = NULL;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp42_ = comment;
+			_tmp44_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp40_ = g_strcmp0 (_tmp42_, "") != 0;
-#line 12865 "PiwigoPublishing.c"
+			_tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
+#line 12879 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp40_ = FALSE;
-#line 12869 "PiwigoPublishing.c"
+			_tmp42_ = FALSE;
+#line 12883 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp40_) {
-#line 12873 "PiwigoPublishing.c"
-			const gchar* _tmp43_ = NULL;
+		if (_tmp42_) {
+#line 12887 "PiwigoPublishing.c"
+			const gchar* _tmp45_ = NULL;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp43_ = comment;
+			_tmp45_ = comment;
 #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 12879 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_);
+#line 12893 "PiwigoPublishing.c"
 		}
 	} else {
-		gboolean _tmp44_ = FALSE;
-		const gchar* _tmp45_ = NULL;
+		gboolean _tmp46_ = FALSE;
+		const gchar* _tmp47_ = NULL;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp45_ = comment;
+		_tmp47_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp45_ != NULL) {
-#line 12888 "PiwigoPublishing.c"
-			const gchar* _tmp46_ = NULL;
+		if (_tmp47_ != NULL) {
+#line 12902 "PiwigoPublishing.c"
+			const gchar* _tmp48_ = NULL;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = comment;
+			_tmp48_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp44_ = g_strcmp0 (_tmp46_, "") != 0;
-#line 12894 "PiwigoPublishing.c"
+			_tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
+#line 12908 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp44_ = FALSE;
-#line 12898 "PiwigoPublishing.c"
+			_tmp46_ = FALSE;
+#line 12912 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp44_) {
-#line 12902 "PiwigoPublishing.c"
-			const gchar* _tmp47_ = NULL;
-			const gchar* _tmp48_ = NULL;
+		if (_tmp46_) {
+#line 12916 "PiwigoPublishing.c"
+			const gchar* _tmp49_ = NULL;
+			const gchar* _tmp50_ = NULL;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp47_ = name;
+			_tmp49_ = name;
 #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_);
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp49_);
 #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp48_ = comment;
+			_tmp50_ = comment;
 #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 12913 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_);
+#line 12927 "PiwigoPublishing.c"
 		} else {
-			PublishingPiwigoPublishingParameters* _tmp49_ = NULL;
-			gboolean _tmp50_ = FALSE;
+			PublishingPiwigoPublishingParameters* _tmp51_ = NULL;
+			gboolean _tmp52_ = FALSE;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp49_ = parameters;
+			_tmp51_ = parameters;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp50_ = _tmp49_->title_as_comment;
+			_tmp52_ = _tmp51_->title_as_comment;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			if (_tmp50_) {
-#line 12923 "PiwigoPublishing.c"
-				const gchar* _tmp51_ = NULL;
+			if (_tmp52_) {
+#line 12937 "PiwigoPublishing.c"
+				const gchar* _tmp53_ = NULL;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp51_ = name;
+				_tmp53_ = name;
 #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 12929 "PiwigoPublishing.c"
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_);
+#line 12943 "PiwigoPublishing.c"
 			} else {
-				const gchar* _tmp52_ = NULL;
+				const gchar* _tmp54_ = NULL;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp52_ = name;
+				_tmp54_ = name;
 #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 12936 "PiwigoPublishing.c"
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_);
+#line 12950 "PiwigoPublishing.c"
 			}
 		}
 	}
 #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 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp53_ = parameters;
+	_tmp55_ = parameters;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp54_ = _tmp53_->category;
+	_tmp56_ = _tmp55_->category;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp55_ = _tmp54_->id;
+	_tmp57_ = _tmp56_->id;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp56_ = g_strdup_printf ("%i", _tmp55_);
+	_tmp58_ = g_strdup_printf ("%i", _tmp57_);
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp57_ = _tmp56_;
+	_tmp59_ = _tmp58_;
 #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_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp59_);
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp57_);
+	_g_free0 (_tmp59_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp58_ = parameters;
+	_tmp60_ = parameters;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp59_ = _tmp58_->perm_level;
+	_tmp61_ = _tmp60_->perm_level;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp60_ = _tmp59_->id;
+	_tmp62_ = _tmp61_->id;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp61_ = g_strdup_printf ("%i", _tmp60_);
+	_tmp63_ = g_strdup_printf ("%i", _tmp62_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp62_ = _tmp61_;
+	_tmp64_ = _tmp63_;
 #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_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp64_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp62_);
+	_g_free0 (_tmp64_);
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp63_ = parameters;
+	_tmp65_ = parameters;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp64_ = _tmp63_->no_upload_tags;
+	_tmp66_ = _tmp65_->no_upload_tags;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp64_) {
-#line 12976 "PiwigoPublishing.c"
-		const gchar* _tmp65_ = NULL;
+	if (!_tmp66_) {
+#line 12990 "PiwigoPublishing.c"
+		const gchar* _tmp67_ = NULL;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp65_ = tags;
+		_tmp67_ = tags;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_strcmp0 (_tmp65_, "") != 0) {
-#line 12982 "PiwigoPublishing.c"
-			const gchar* _tmp66_ = NULL;
+		if (g_strcmp0 (_tmp67_, "") != 0) {
+#line 12996 "PiwigoPublishing.c"
+			const gchar* _tmp68_ = NULL;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp66_ = tags;
+			_tmp68_ = tags;
 #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 12988 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_);
+#line 13002 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp67_ = g_str_hash;
+	_tmp69_ = g_str_hash;
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp68_ = g_str_equal;
+	_tmp70_ = g_str_equal;
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_);
+	_tmp71_ = g_hash_table_new_full (_tmp69_, _tmp70_, _g_free0_, _g_free0_);
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	disposition_table = _tmp69_;
+	disposition_table = _tmp71_;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp70_ = g_strdup ("filename");
+	_tmp72_ = g_strdup ("filename");
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp71_ = publishable;
+	_tmp73_ = publishable;
 #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);
+	_tmp74_ = spit_publishing_publishable_get_param_string (_tmp73_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp73_ = _tmp72_;
+	_tmp75_ = _tmp74_;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp74_ = soup_uri_encode (_tmp73_, NULL);
+	_tmp76_ = soup_uri_encode (_tmp75_, NULL);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp70_, _tmp74_);
+	g_hash_table_insert (disposition_table, _tmp72_, _tmp76_);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp73_);
+	_g_free0 (_tmp75_);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp75_ = g_strdup ("name");
+	_tmp77_ = g_strdup ("name");
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp76_ = g_strdup ("image");
+	_tmp78_ = g_strdup ("image");
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp75_, _tmp76_);
+	g_hash_table_insert (disposition_table, _tmp77_, _tmp78_);
 #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 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13045,14 +13059,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 13033 "PiwigoPublishing.c"
+#line 13047 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #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 13040 "PiwigoPublishing.c"
+#line 13054 "PiwigoPublishing.c"
 }
 
 
@@ -13063,7 +13077,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 13051 "PiwigoPublishing.c"
+#line 13065 "PiwigoPublishing.c"
 }
 
 
@@ -13072,7 +13086,7 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi
 	self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
 #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 13060 "PiwigoPublishing.c"
+#line 13074 "PiwigoPublishing.c"
 }
 
 
@@ -13084,7 +13098,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #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 13072 "PiwigoPublishing.c"
+#line 13086 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index ca07554..60219a6 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1733,7 +1733,7 @@ private class ImagesAddTransaction : Publishing.RESTSupport.UploadTransaction {
         string name = publishable.get_publishing_name();
         string comment = publishable.get_param_string(
             Spit.Publishing.Publishable.PARAM_STRING_COMMENT);
-        if (name != "") {
+        if (name == null || name == "") {
             name = publishable.get_param_string(
                 Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
             add_argument("name", name);
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 4d842f6..2d28be0 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -1,4 +1,4 @@
-/* YouTubePublishing.c generated by valac 0.32.1, the Vala compiler
+/* YouTubePublishing.c generated by valac 0.34.4, the Vala compiler
  * generated from YouTubePublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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_dup10 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup9 (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,10 +438,8 @@ 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  {
@@ -467,7 +465,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 449 "YouTubePublishing.c"
+#line 447 "YouTubePublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -480,18 +478,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 462 "YouTubePublishing.c"
+#line 460 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 466 "YouTubePublishing.c"
+#line 464 "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 473 "YouTubePublishing.c"
+#line 471 "YouTubePublishing.c"
 }
 
 
@@ -513,7 +511,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 495 "YouTubePublishing.c"
+#line 493 "YouTubePublishing.c"
 }
 
 
@@ -526,7 +524,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 508 "YouTubePublishing.c"
+#line 506 "YouTubePublishing.c"
 }
 
 
@@ -539,35 +537,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 521 "YouTubePublishing.c"
+#line 519 "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 528 "YouTubePublishing.c"
+#line 526 "YouTubePublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup9 (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 539 "YouTubePublishing.c"
+#line 537 "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 545 "YouTubePublishing.c"
+#line 543 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 549 "YouTubePublishing.c"
+#line 547 "YouTubePublishing.c"
 }
 
 
@@ -640,7 +638,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_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_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"
@@ -649,7 +647,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 631 "YouTubePublishing.c"
+#line 629 "YouTubePublishing.c"
 }
 
 
@@ -670,7 +668,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 652 "YouTubePublishing.c"
+#line 650 "YouTubePublishing.c"
 }
 
 
@@ -683,7 +681,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 665 "YouTubePublishing.c"
+#line 663 "YouTubePublishing.c"
 }
 
 
@@ -691,7 +689,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 673 "YouTubePublishing.c"
+#line 671 "YouTubePublishing.c"
 }
 
 
@@ -700,7 +698,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 682 "YouTubePublishing.c"
+#line 680 "YouTubePublishing.c"
 }
 
 
@@ -717,7 +715,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 699 "YouTubePublishing.c"
+#line 697 "YouTubePublishing.c"
 }
 
 
@@ -728,7 +726,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 710 "YouTubePublishing.c"
+#line 708 "YouTubePublishing.c"
 }
 
 
@@ -742,7 +740,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 724 "YouTubePublishing.c"
+#line 722 "YouTubePublishing.c"
 }
 
 
@@ -790,14 +788,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 772 "YouTubePublishing.c"
+#line 770 "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 779 "YouTubePublishing.c"
+#line 777 "YouTubePublishing.c"
 }
 
 
@@ -812,7 +810,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 794 "YouTubePublishing.c"
+#line 792 "YouTubePublishing.c"
 }
 
 
@@ -824,7 +822,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 806 "YouTubePublishing.c"
+#line 804 "YouTubePublishing.c"
 }
 
 
@@ -842,7 +840,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 824 "YouTubePublishing.c"
+#line 822 "YouTubePublishing.c"
 }
 
 
@@ -859,7 +857,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 841 "YouTubePublishing.c"
+#line 839 "YouTubePublishing.c"
 }
 
 
@@ -877,7 +875,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 859 "YouTubePublishing.c"
+#line 857 "YouTubePublishing.c"
 }
 
 
@@ -894,14 +892,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 876 "YouTubePublishing.c"
+#line 874 "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 883 "YouTubePublishing.c"
+#line 881 "YouTubePublishing.c"
 }
 
 
@@ -910,7 +908,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 892 "YouTubePublishing.c"
+#line 890 "YouTubePublishing.c"
 	}
 }
 
@@ -920,11 +918,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 902 "YouTubePublishing.c"
+#line 900 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 906 "YouTubePublishing.c"
+#line 904 "YouTubePublishing.c"
 	}
 }
 
@@ -932,37 +930,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 914 "YouTubePublishing.c"
+#line 912 "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 921 "YouTubePublishing.c"
+#line 919 "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 928 "YouTubePublishing.c"
+#line 926 "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 932 "YouTubePublishing.c"
+#line 930 "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 936 "YouTubePublishing.c"
+#line 934 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 940 "YouTubePublishing.c"
+#line 938 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 944 "YouTubePublishing.c"
+#line 942 "YouTubePublishing.c"
 }
 
 
@@ -973,25 +971,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 955 "YouTubePublishing.c"
+#line 953 "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 961 "YouTubePublishing.c"
+#line 959 "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 965 "YouTubePublishing.c"
+#line 963 "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 969 "YouTubePublishing.c"
+#line 967 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 973 "YouTubePublishing.c"
+#line 971 "YouTubePublishing.c"
 }
 
 
@@ -1005,7 +1003,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 987 "YouTubePublishing.c"
+#line 985 "YouTubePublishing.c"
 }
 
 
@@ -1014,7 +1012,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 996 "YouTubePublishing.c"
+#line 994 "YouTubePublishing.c"
 }
 
 
@@ -1034,17 +1032,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 1016 "YouTubePublishing.c"
+#line 1014 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1020 "YouTubePublishing.c"
+#line 1018 "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 1026 "YouTubePublishing.c"
+#line 1024 "YouTubePublishing.c"
 	}
 }
 
@@ -1063,17 +1061,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 1045 "YouTubePublishing.c"
+#line 1043 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1049 "YouTubePublishing.c"
+#line 1047 "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 1055 "YouTubePublishing.c"
+#line 1053 "YouTubePublishing.c"
 	}
 }
 
@@ -1085,7 +1083,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 1067 "YouTubePublishing.c"
+#line 1065 "YouTubePublishing.c"
 }
 
 
@@ -1094,7 +1092,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 1076 "YouTubePublishing.c"
+#line 1074 "YouTubePublishing.c"
 }
 
 
@@ -1108,7 +1106,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 1090 "YouTubePublishing.c"
+#line 1088 "YouTubePublishing.c"
 }
 
 
@@ -1133,7 +1131,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 1115 "YouTubePublishing.c"
+#line 1113 "YouTubePublishing.c"
 }
 
 
@@ -1146,7 +1144,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 1128 "YouTubePublishing.c"
+#line 1126 "YouTubePublishing.c"
 	}
 }
 
@@ -1200,14 +1198,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 1182 "YouTubePublishing.c"
+#line 1180 "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 1189 "YouTubePublishing.c"
+#line 1187 "YouTubePublishing.c"
 }
 
 
@@ -1223,7 +1221,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 1205 "YouTubePublishing.c"
+#line 1203 "YouTubePublishing.c"
 }
 
 
@@ -1241,7 +1239,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 1223 "YouTubePublishing.c"
+#line 1221 "YouTubePublishing.c"
 	}
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = TRUE;
@@ -1251,14 +1249,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 1233 "YouTubePublishing.c"
+#line 1231 "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 1240 "YouTubePublishing.c"
+#line 1238 "YouTubePublishing.c"
 	}
 }
 
@@ -1281,7 +1279,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 1263 "YouTubePublishing.c"
+#line 1261 "YouTubePublishing.c"
 }
 
 
@@ -1308,7 +1306,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 1290 "YouTubePublishing.c"
+#line 1288 "YouTubePublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1317,7 +1315,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 1299 "YouTubePublishing.c"
+#line 1297 "YouTubePublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -1327,13 +1325,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 1309 "YouTubePublishing.c"
+#line 1307 "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 1315 "YouTubePublishing.c"
+#line 1313 "YouTubePublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1348,7 +1346,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 1330 "YouTubePublishing.c"
+#line 1328 "YouTubePublishing.c"
 			} else {
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_g_free0 (_result_);
@@ -1358,7 +1356,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 1340 "YouTubePublishing.c"
+#line 1338 "YouTubePublishing.c"
 			}
 		}
 	}
@@ -1368,7 +1366,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 1350 "YouTubePublishing.c"
+#line 1348 "YouTubePublishing.c"
 			xmlNode* _tmp12_ = NULL;
 			xmlNode* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -1381,7 +1379,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 1363 "YouTubePublishing.c"
+#line 1361 "YouTubePublishing.c"
 				xmlNode* _tmp10_ = NULL;
 				xmlNode* _tmp11_ = NULL;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1390,7 +1388,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 1372 "YouTubePublishing.c"
+#line 1370 "YouTubePublishing.c"
 			}
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp9_ = FALSE;
@@ -1400,7 +1398,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 1382 "YouTubePublishing.c"
+#line 1380 "YouTubePublishing.c"
 			}
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp13_ = doc_node_iter;
@@ -1410,7 +1408,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 1392 "YouTubePublishing.c"
+#line 1390 "YouTubePublishing.c"
 			}
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			name_val = NULL;
@@ -1422,20 +1420,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 1404 "YouTubePublishing.c"
+#line 1402 "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 1411 "YouTubePublishing.c"
+#line 1409 "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 1417 "YouTubePublishing.c"
+#line 1415 "YouTubePublishing.c"
 						xmlNode* _tmp18_ = NULL;
 						xmlNode* _tmp19_ = NULL;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1444,7 +1442,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 1426 "YouTubePublishing.c"
+#line 1424 "YouTubePublishing.c"
 					}
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					_tmp17_ = FALSE;
@@ -1454,7 +1452,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 1436 "YouTubePublishing.c"
+#line 1434 "YouTubePublishing.c"
 					}
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					_tmp21_ = channel_node_iter;
@@ -1462,7 +1460,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 1444 "YouTubePublishing.c"
+#line 1442 "YouTubePublishing.c"
 						xmlNode* _tmp23_ = NULL;
 						gchar* _tmp24_ = NULL;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1473,7 +1471,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 1455 "YouTubePublishing.c"
+#line 1453 "YouTubePublishing.c"
 					} else {
 						xmlNode* _tmp25_ = NULL;
 						const gchar* _tmp26_ = NULL;
@@ -1483,7 +1481,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 1465 "YouTubePublishing.c"
+#line 1463 "YouTubePublishing.c"
 							xmlNode* _tmp27_ = NULL;
 							xmlNs* _tmp28_ = NULL;
 							const gchar* _tmp29_ = NULL;
@@ -1499,7 +1497,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 1481 "YouTubePublishing.c"
+#line 1479 "YouTubePublishing.c"
 							}
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 							_tmp30_ = channel_node_iter;
@@ -1509,7 +1507,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 1491 "YouTubePublishing.c"
+#line 1489 "YouTubePublishing.c"
 						}
 					}
 				}
@@ -1528,7 +1526,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 1510 "YouTubePublishing.c"
+#line 1508 "YouTubePublishing.c"
 		}
 	}
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1540,7 +1538,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 1521 "YouTubePublishing.c"
+#line 1519 "YouTubePublishing.c"
 }
 
 
@@ -1558,13 +1556,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 1538 "YouTubePublishing.c"
+#line 1536 "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 1544 "YouTubePublishing.c"
+#line 1542 "YouTubePublishing.c"
 }
 
 
@@ -1618,21 +1616,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 1598 "YouTubePublishing.c"
+#line 1596 "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 1605 "YouTubePublishing.c"
+#line 1603 "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 1612 "YouTubePublishing.c"
+#line 1610 "YouTubePublishing.c"
 }
 
 
@@ -1668,13 +1666,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 1647 "YouTubePublishing.c"
+#line 1645 "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 1653 "YouTubePublishing.c"
+#line 1651 "YouTubePublishing.c"
 }
 
 
@@ -1722,7 +1720,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 1700 "YouTubePublishing.c"
+#line 1698 "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));
@@ -1730,7 +1728,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 1708 "YouTubePublishing.c"
+#line 1706 "YouTubePublishing.c"
 }
 
 
@@ -1747,11 +1745,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 1724 "YouTubePublishing.c"
+#line 1722 "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 1728 "YouTubePublishing.c"
+#line 1726 "YouTubePublishing.c"
 }
 
 
@@ -1768,11 +1766,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 1744 "YouTubePublishing.c"
+#line 1742 "YouTubePublishing.c"
 	}
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1748 "YouTubePublishing.c"
+#line 1746 "YouTubePublishing.c"
 }
 
 
@@ -1804,7 +1802,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 1779 "YouTubePublishing.c"
+#line 1777 "YouTubePublishing.c"
 	}
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
@@ -1816,21 +1814,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 1791 "YouTubePublishing.c"
+#line 1789 "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 1798 "YouTubePublishing.c"
+#line 1796 "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 1805 "YouTubePublishing.c"
+#line 1803 "YouTubePublishing.c"
 }
 
 
@@ -1868,11 +1866,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 1842 "YouTubePublishing.c"
+#line 1840 "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 1846 "YouTubePublishing.c"
+#line 1844 "YouTubePublishing.c"
 }
 
 
@@ -1908,7 +1906,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 1882 "YouTubePublishing.c"
+#line 1880 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = err;
@@ -1923,14 +1921,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 1896 "YouTubePublishing.c"
+#line 1894 "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 1903 "YouTubePublishing.c"
+#line 1901 "YouTubePublishing.c"
 }
 
 
@@ -1944,7 +1942,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 1917 "YouTubePublishing.c"
+#line 1915 "YouTubePublishing.c"
 }
 
 
@@ -1985,7 +1983,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 1958 "YouTubePublishing.c"
+#line 1956 "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_);
@@ -1993,7 +1991,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 1966 "YouTubePublishing.c"
+#line 1964 "YouTubePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2004,7 +2002,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 1977 "YouTubePublishing.c"
+#line 1975 "YouTubePublishing.c"
 		}
 	}
 	goto __finally27;
@@ -2022,7 +2020,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 1995 "YouTubePublishing.c"
+#line 1993 "YouTubePublishing.c"
 	}
 	__finally27:
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2035,11 +2033,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 2008 "YouTubePublishing.c"
+#line 2006 "YouTubePublishing.c"
 	}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2012 "YouTubePublishing.c"
+#line 2010 "YouTubePublishing.c"
 }
 
 
@@ -2048,7 +2046,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 2021 "YouTubePublishing.c"
+#line 2019 "YouTubePublishing.c"
 }
 
 
@@ -2062,7 +2060,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 2034 "YouTubePublishing.c"
+#line 2032 "YouTubePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL;
@@ -2089,7 +2087,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 2061 "YouTubePublishing.c"
+#line 2059 "YouTubePublishing.c"
 				goto __catch28_spit_publishing_publishing_error;
 			}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2100,7 +2098,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 2072 "YouTubePublishing.c"
+#line 2070 "YouTubePublishing.c"
 		}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp6_ = _tmp0_;
@@ -2112,7 +2110,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 2084 "YouTubePublishing.c"
+#line 2082 "YouTubePublishing.c"
 	}
 	goto __finally28;
 	__catch28_spit_publishing_publishing_error:
@@ -2136,7 +2134,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 2108 "YouTubePublishing.c"
+#line 2106 "YouTubePublishing.c"
 	}
 	__finally28:
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2149,7 +2147,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 2121 "YouTubePublishing.c"
+#line 2119 "YouTubePublishing.c"
 	}
 	{
 		gchar* _tmp9_ = NULL;
@@ -2169,7 +2167,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 2141 "YouTubePublishing.c"
+#line 2139 "YouTubePublishing.c"
 				goto __catch29_spit_publishing_publishing_error;
 			}
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2180,7 +2178,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 2152 "YouTubePublishing.c"
+#line 2150 "YouTubePublishing.c"
 		}
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp13_ = self->priv->publishing_parameters;
@@ -2188,7 +2186,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 2160 "YouTubePublishing.c"
+#line 2158 "YouTubePublishing.c"
 	}
 	goto __finally29;
 	__catch29_spit_publishing_publishing_error:
@@ -2212,7 +2210,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 2184 "YouTubePublishing.c"
+#line 2182 "YouTubePublishing.c"
 	}
 	__finally29:
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2225,27 +2223,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 2197 "YouTubePublishing.c"
+#line 2195 "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 2203 "YouTubePublishing.c"
+#line 2201 "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 2210 "YouTubePublishing.c"
+#line 2208 "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 2217 "YouTubePublishing.c"
+#line 2215 "YouTubePublishing.c"
 }
 
 
@@ -2271,7 +2269,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 2243 "YouTubePublishing.c"
+#line 2241 "YouTubePublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2280,7 +2278,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 2252 "YouTubePublishing.c"
+#line 2250 "YouTubePublishing.c"
 			goto __catch30_g_error;
 		}
 	}
@@ -2323,7 +2321,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 2294 "YouTubePublishing.c"
+#line 2292 "YouTubePublishing.c"
 	}
 	__finally30:
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2336,7 +2334,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 2307 "YouTubePublishing.c"
+#line 2305 "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));
@@ -2370,14 +2368,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 2341 "YouTubePublishing.c"
+#line 2339 "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 2348 "YouTubePublishing.c"
+#line 2346 "YouTubePublishing.c"
 }
 
 
@@ -2443,7 +2441,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 2413 "YouTubePublishing.c"
+#line 2411 "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));
@@ -2489,7 +2487,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 2459 "YouTubePublishing.c"
+#line 2457 "YouTubePublishing.c"
 }
 
 
@@ -2508,7 +2506,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 2478 "YouTubePublishing.c"
+#line 2476 "YouTubePublishing.c"
 }
 
 
@@ -2539,7 +2537,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 2509 "YouTubePublishing.c"
+#line 2507 "YouTubePublishing.c"
 }
 
 
@@ -2554,14 +2552,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 2524 "YouTubePublishing.c"
+#line 2522 "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 2531 "YouTubePublishing.c"
+#line 2529 "YouTubePublishing.c"
 }
 
 
@@ -2589,7 +2587,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 2559 "YouTubePublishing.c"
+#line 2557 "YouTubePublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -2599,7 +2597,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 2569 "YouTubePublishing.c"
+#line 2567 "YouTubePublishing.c"
 	}
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp2_) {
@@ -2607,7 +2605,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 2577 "YouTubePublishing.c"
+#line 2575 "YouTubePublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2616,7 +2614,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 2586 "YouTubePublishing.c"
+#line 2584 "YouTubePublishing.c"
 	}
 }
 
@@ -2624,7 +2622,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 2594 "YouTubePublishing.c"
+#line 2592 "YouTubePublishing.c"
 }
 
 
@@ -2661,14 +2659,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 2631 "YouTubePublishing.c"
+#line 2629 "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 2638 "YouTubePublishing.c"
+#line 2636 "YouTubePublishing.c"
 }
 
 
@@ -2690,7 +2688,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 2660 "YouTubePublishing.c"
+#line 2658 "YouTubePublishing.c"
 }
 
 
@@ -2709,28 +2707,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 2679 "YouTubePublishing.c"
+#line 2677 "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 2686 "YouTubePublishing.c"
+#line 2684 "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 2693 "YouTubePublishing.c"
+#line 2691 "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 2700 "YouTubePublishing.c"
+#line 2698 "YouTubePublishing.c"
 }
 
 
@@ -2953,7 +2951,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 2923 "YouTubePublishing.c"
+#line 2921 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
 		gint desc_collection_length1 = 0;
@@ -2965,14 +2963,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 2935 "YouTubePublishing.c"
+#line 2933 "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 2942 "YouTubePublishing.c"
+#line 2940 "YouTubePublishing.c"
 			{
 				GtkComboBoxText* _tmp48_ = NULL;
 				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL;
@@ -2987,7 +2985,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 2957 "YouTubePublishing.c"
+#line 2955 "YouTubePublishing.c"
 			}
 		}
 	}
@@ -3011,14 +3009,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 2981 "YouTubePublishing.c"
+#line 2979 "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 2988 "YouTubePublishing.c"
+#line 2986 "YouTubePublishing.c"
 }
 
 
@@ -3050,7 +3048,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 3020 "YouTubePublishing.c"
+#line 3018 "YouTubePublishing.c"
 }
 
 
@@ -3059,7 +3057,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 3029 "YouTubePublishing.c"
+#line 3027 "YouTubePublishing.c"
 }
 
 
@@ -3071,7 +3069,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 3041 "YouTubePublishing.c"
+#line 3039 "YouTubePublishing.c"
 }
 
 
@@ -3082,13 +3080,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 3052 "YouTubePublishing.c"
+#line 3050 "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 3058 "YouTubePublishing.c"
+#line 3056 "YouTubePublishing.c"
 }
 
 
@@ -3099,13 +3097,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 3069 "YouTubePublishing.c"
+#line 3067 "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 3075 "YouTubePublishing.c"
+#line 3073 "YouTubePublishing.c"
 }
 
 
@@ -3116,13 +3114,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 3086 "YouTubePublishing.c"
+#line 3084 "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 3092 "YouTubePublishing.c"
+#line 3090 "YouTubePublishing.c"
 }
 
 
@@ -3194,13 +3192,13 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 	if (result_length1) {
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 3164 "YouTubePublishing.c"
+#line 3162 "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 3170 "YouTubePublishing.c"
+#line 3168 "YouTubePublishing.c"
 }
 
 
@@ -3224,7 +3222,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 3194 "YouTubePublishing.c"
+#line 3192 "YouTubePublishing.c"
 }
 
 
@@ -3237,7 +3235,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 3207 "YouTubePublishing.c"
+#line 3205 "YouTubePublishing.c"
 }
 
 
@@ -3247,7 +3245,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 3217 "YouTubePublishing.c"
+#line 3215 "YouTubePublishing.c"
 }
 
 
@@ -3255,7 +3253,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 3225 "YouTubePublishing.c"
+#line 3223 "YouTubePublishing.c"
 }
 
 
@@ -3282,21 +3280,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
 	self->privacy_setting = _tmp2_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3252 "YouTubePublishing.c"
+#line 3250 "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 3259 "YouTubePublishing.c"
+#line 3257 "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 3266 "YouTubePublishing.c"
+#line 3264 "YouTubePublishing.c"
 }
 
 
@@ -3305,7 +3303,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 3275 "YouTubePublishing.c"
+#line 3273 "YouTubePublishing.c"
 	}
 }
 
@@ -3315,11 +3313,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 3285 "YouTubePublishing.c"
+#line 3283 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3289 "YouTubePublishing.c"
+#line 3287 "YouTubePublishing.c"
 	}
 }
 
@@ -3327,37 +3325,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 3297 "YouTubePublishing.c"
+#line 3295 "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 3304 "YouTubePublishing.c"
+#line 3302 "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 3311 "YouTubePublishing.c"
+#line 3309 "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 3315 "YouTubePublishing.c"
+#line 3313 "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 3319 "YouTubePublishing.c"
+#line 3317 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3323 "YouTubePublishing.c"
+#line 3321 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3327 "YouTubePublishing.c"
+#line 3325 "YouTubePublishing.c"
 }
 
 
@@ -3368,25 +3366,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 3338 "YouTubePublishing.c"
+#line 3336 "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 3344 "YouTubePublishing.c"
+#line 3342 "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 3348 "YouTubePublishing.c"
+#line 3346 "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 3352 "YouTubePublishing.c"
+#line 3350 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3356 "YouTubePublishing.c"
+#line 3354 "YouTubePublishing.c"
 }
 
 
@@ -3400,7 +3398,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 3370 "YouTubePublishing.c"
+#line 3368 "YouTubePublishing.c"
 }
 
 
@@ -3409,7 +3407,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 3379 "YouTubePublishing.c"
+#line 3377 "YouTubePublishing.c"
 }
 
 
@@ -3429,17 +3427,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 3399 "YouTubePublishing.c"
+#line 3397 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3403 "YouTubePublishing.c"
+#line 3401 "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 3409 "YouTubePublishing.c"
+#line 3407 "YouTubePublishing.c"
 	}
 }
 
@@ -3458,17 +3456,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 3428 "YouTubePublishing.c"
+#line 3426 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3432 "YouTubePublishing.c"
+#line 3430 "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 3438 "YouTubePublishing.c"
+#line 3436 "YouTubePublishing.c"
 	}
 }
 
@@ -3478,14 +3476,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 3448 "YouTubePublishing.c"
+#line 3446 "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 3455 "YouTubePublishing.c"
+#line 3453 "YouTubePublishing.c"
 }
 
 
@@ -3497,7 +3495,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 3467 "YouTubePublishing.c"
+#line 3465 "YouTubePublishing.c"
 }
 
 
@@ -3522,7 +3520,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 3492 "YouTubePublishing.c"
+#line 3490 "YouTubePublishing.c"
 }
 
 
@@ -3535,7 +3533,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 3505 "YouTubePublishing.c"
+#line 3503 "YouTubePublishing.c"
 	}
 }
 
@@ -3551,7 +3549,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 3521 "YouTubePublishing.c"
+#line 3519 "YouTubePublishing.c"
 }
 
 
@@ -3566,7 +3564,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 3536 "YouTubePublishing.c"
+#line 3534 "YouTubePublishing.c"
 }
 
 
@@ -3589,7 +3587,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 3559 "YouTubePublishing.c"
+#line 3557 "YouTubePublishing.c"
 }
 
 
@@ -3619,7 +3617,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 3589 "YouTubePublishing.c"
+#line 3587 "YouTubePublishing.c"
 }
 
 
@@ -3640,7 +3638,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 3610 "YouTubePublishing.c"
+#line 3608 "YouTubePublishing.c"
 }
 
 
@@ -3697,14 +3695,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 3667 "YouTubePublishing.c"
+#line 3665 "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 3674 "YouTubePublishing.c"
+#line 3672 "YouTubePublishing.c"
 }
 
 
@@ -3720,69 +3718,55 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 3718 "YouTubePublishing.c"
+#line 3716 "YouTubePublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#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"
+#line 3722 "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 3738 "YouTubePublishing.c"
+#line 3729 "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 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"
+#line 3736 "YouTubePublishing.c"
 }
 
 
@@ -3818,47 +3802,44 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	gint _tmp22__length1 = 0;
 	guint8* _tmp23_ = NULL;
 	gint _tmp23__length1 = 0;
-	guint8* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	SoupBuffer* _tmp25_ = NULL;
-	SoupMultipart* _tmp26_ = NULL;
-	SoupBuffer* _tmp27_ = NULL;
+	SoupBuffer* _tmp24_ = NULL;
+	SoupMultipart* _tmp25_ = NULL;
+	SoupBuffer* _tmp26_ = NULL;
 	gchar* video_data = NULL;
 	gsize data_length = 0UL;
 	SoupBuffer* bindable_data = NULL;
-	const gchar* _tmp47_ = NULL;
+	const gchar* _tmp46_ = NULL;
+	guint8* _tmp47_ = NULL;
+	gint _tmp47__length1 = 0;
 	guint8* _tmp48_ = NULL;
 	gint _tmp48__length1 = 0;
-	guint8* _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	guint8* _tmp50_ = NULL;
-	gint _tmp50__length1 = 0;
-	SoupBuffer* _tmp51_ = NULL;
-	SoupMultipart* _tmp52_ = NULL;
-	SpitPublishingPublishable* _tmp53_ = NULL;
+	gsize _tmp49_ = 0UL;
+	SoupBuffer* _tmp50_ = NULL;
+	SoupMultipart* _tmp51_ = NULL;
+	SpitPublishingPublishable* _tmp52_ = NULL;
+	GFile* _tmp53_ = NULL;
 	GFile* _tmp54_ = NULL;
-	GFile* _tmp55_ = NULL;
+	gchar* _tmp55_ = NULL;
 	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
 	SoupMessage* outbound_message = NULL;
+	gchar* _tmp57_ = NULL;
 	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	SoupMultipart* _tmp60_ = NULL;
+	SoupMultipart* _tmp59_ = NULL;
+	SoupMessage* _tmp60_ = NULL;
 	SoupMessage* _tmp61_ = NULL;
-	SoupMessage* _tmp62_ = NULL;
-	SoupMessageHeaders* _tmp63_ = NULL;
+	SoupMessageHeaders* _tmp62_ = NULL;
+	gchar* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	SoupMessageHeaders* _tmp66_ = NULL;
-	SpitPublishingPublishable* _tmp67_ = NULL;
+	SoupMessageHeaders* _tmp65_ = NULL;
+	SpitPublishingPublishable* _tmp66_ = NULL;
+	gchar* _tmp67_ = NULL;
 	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	SoupMessageHeaders* _tmp70_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp71_ = NULL;
+	SoupMessageHeaders* _tmp69_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp70_ = NULL;
+	gchar* _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);
@@ -3874,11 +3855,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 3844 "YouTubePublishing.c"
+#line 3825 "YouTubePublishing.c"
 	} else {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = "";
-#line 3848 "YouTubePublishing.c"
+#line 3829 "YouTubePublishing.c"
 	}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = g_strdup (_tmp1_);
@@ -3892,11 +3873,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 3862 "YouTubePublishing.c"
+#line 3843 "YouTubePublishing.c"
 	} else {
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp5_ = "";
-#line 3866 "YouTubePublishing.c"
+#line 3847 "YouTubePublishing.c"
 	}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = g_strdup (_tmp5_);
@@ -3912,7 +3893,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 3882 "YouTubePublishing.c"
+#line 3863 "YouTubePublishing.c"
 		SpitPublishingPublishable* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3923,7 +3904,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 3893 "YouTubePublishing.c"
+#line 3874 "YouTubePublishing.c"
 	}
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp14_ = title;
@@ -3952,55 +3933,51 @@ 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_ = (_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;
+	_tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = soup_buffer_new_take (_tmp24_, _tmp24__length1);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata_buffer = _tmp25_;
+	metadata_buffer = _tmp24_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = message_parts;
+	_tmp25_ = message_parts;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp27_ = metadata_buffer;
+	_tmp26_ = metadata_buffer;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp26_, "", "", "application/atom+xml", _tmp27_);
-#line 3935 "YouTubePublishing.c"
+	soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_);
+#line 3912 "YouTubePublishing.c"
 	{
-		SpitPublishingPublishable* _tmp28_ = NULL;
+		SpitPublishingPublishable* _tmp27_ = NULL;
+		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-		GFile* _tmp30_ = NULL;
+		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gsize _tmp34_ = 0UL;
+		gsize _tmp33_ = 0UL;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp28_ = self->priv->publishable;
+		_tmp27_ = self->priv->publishable;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
+		_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp30_ = _tmp29_;
+		_tmp29_ = _tmp28_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = g_file_get_path (_tmp30_);
+		_tmp30_ = g_file_get_path (_tmp29_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp32_ = _tmp31_;
+		_tmp31_ = _tmp30_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_file_get_contents (_tmp32_, &_tmp33_, &_tmp34_, &_inner_error_);
+		g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_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 = _tmp33_;
+		video_data = _tmp32_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		data_length = _tmp34_;
+		data_length = _tmp33_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp32_);
+		_g_free0 (_tmp31_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp30_);
+		_g_object_unref0 (_tmp29_);
 #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 3970 "YouTubePublishing.c"
+#line 3947 "YouTubePublishing.c"
 				goto __catch31_g_file_error;
 			}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4023,7 +4000,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 3993 "YouTubePublishing.c"
+#line 3970 "YouTubePublishing.c"
 		}
 	}
 	goto __finally31;
@@ -4031,61 +4008,61 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp35_ = NULL;
+		SpitPublishingPublishable* _tmp34_ = NULL;
+		GFile* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
-		GFile* _tmp37_ = NULL;
+		gchar* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		GError* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
+		GError* _tmp39_ = NULL;
+		const gchar* _tmp40_ = NULL;
+		gchar* _tmp41_ = NULL;
 		gchar* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
+		const gchar* _tmp43_ = NULL;
 		const gchar* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		GError* _tmp46_ = NULL;
+		GError* _tmp45_ = 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"
-		_tmp35_ = self->priv->publishable;
+		_tmp34_ = self->priv->publishable;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp36_ = spit_publishing_publishable_get_serialized_file (_tmp35_);
+		_tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = _tmp36_;
+		_tmp36_ = _tmp35_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp38_ = g_file_get_path (_tmp37_);
+		_tmp37_ = g_file_get_path (_tmp36_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp39_ = _tmp38_;
+		_tmp38_ = _tmp37_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp40_ = e;
+		_tmp39_ = e;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp41_ = _tmp40_->message;
+		_tmp40_ = _tmp39_->message;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp42_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp39_, _tmp41_);
+		_tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp43_ = _tmp42_;
+		_tmp42_ = _tmp41_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp39_);
+		_g_free0 (_tmp38_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp37_);
+		_g_object_unref0 (_tmp36_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		msg = _tmp43_;
+		msg = _tmp42_;
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp44_ = msg;
+		_tmp43_ = msg;
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:580: %s", _tmp44_);
+		g_warning ("YouTubePublishing.vala:580: %s", _tmp43_);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp45_ = msg;
+		_tmp44_ = msg;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp46_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp45_);
+		_tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = _tmp46_;
+		_inner_error_ = _tmp45_;
 #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 4055 "YouTubePublishing.c"
+#line 4032 "YouTubePublishing.c"
 		goto __finally31;
 	}
 	__finally31:
@@ -4111,7 +4088,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 4081 "YouTubePublishing.c"
+#line 4058 "YouTubePublishing.c"
 		} else {
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
@@ -4133,156 +4110,154 @@ 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 4103 "YouTubePublishing.c"
+#line 4080 "YouTubePublishing.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = video_data;
+	_tmp46_ = video_data;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = string_get_data (_tmp47_, &_tmp48__length1);
+	_tmp47_ = string_get_data (_tmp46_, &_tmp47__length1);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49__length1 = _tmp48__length1;
+	_tmp48__length1 = _tmp47__length1;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50_ = (_tmp49_ != NULL) ? _vala_array_dup12 (_tmp49_, _tmp49__length1) : ((gpointer) _tmp49_);
+	_tmp49_ = data_length;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50__length1 = _tmp49__length1;
+	_tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_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;
+	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_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp67_ = self->priv->publishable;
+	_tmp62_ = outbound_message->request_headers;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp68_ = spit_publishing_publishable_get_param_string (_tmp67_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+	_tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp69_ = _tmp68_;
+	_tmp64_ = _tmp63_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp66_, "Slug", _tmp69_);
+	soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_);
 #line 597 "/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"
+	_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"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#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 605 "/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"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (metadata);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (private_video);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (unlisted_video);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4226 "YouTubePublishing.c"
+#line 4201 "YouTubePublishing.c"
 		} else {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (metadata);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (private_video);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (unlisted_video);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/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 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4252 "YouTubePublishing.c"
+#line 4227 "YouTubePublishing.c"
 		}
 	}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4303,7 +4278,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 4273 "YouTubePublishing.c"
+#line 4248 "YouTubePublishing.c"
 }
 
 
@@ -4316,14 +4291,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 4286 "YouTubePublishing.c"
+#line 4261 "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 4293 "YouTubePublishing.c"
+#line 4268 "YouTubePublishing.c"
 }
 
 
@@ -4339,7 +4314,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 4309 "YouTubePublishing.c"
+#line 4284 "YouTubePublishing.c"
 }
 
 
@@ -4362,36 +4337,36 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
 	gint _tmp1__length1 = 0;
 	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
 	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishables;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 615 "/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 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = parameters;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 4354 "YouTubePublishing.c"
+#line 4329 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 613 "/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 4361 "YouTubePublishing.c"
+#line 4336 "YouTubePublishing.c"
 }
 
 
@@ -4405,65 +4380,65 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
 	SpitPublishingPublishable* _tmp4_ = NULL;
 	PublishingYouTubeUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/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 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/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 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp6_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 4401 "YouTubePublishing.c"
+#line 4376 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction;
-#line 4414 "YouTubePublishing.c"
+#line 4389 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4421 "YouTubePublishing.c"
+#line 4396 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingYouTubeUploader * self;
-#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 610 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4433 "YouTubePublishing.c"
+#line 4408 "YouTubePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index d7db9f8..48241bd 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);
-        var metadata_buffer = new Soup.Buffer.take (metadata.data);
+        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
         message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
 
         // attempt to read the binary video data from disk
@@ -585,7 +585,8 @@ 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.
-        var bindable_data = new Soup.Buffer.take (video_data.data);
+        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY,
+            video_data.data[0:data_length]);
 
         message_parts.append_form_file("", publishable.get_serialized_file().get_path(),
             "video/mpeg", bindable_data);
diff --git a/plugins/shotwell-publishing/facebook_publishing_options_pane.ui b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui
index 674b078..4d6b021 100644
--- a/plugins/shotwell-publishing/facebook_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="facebook_pane_box">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -16,9 +17,11 @@
           <object class="GtkLabel" id="how_to_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0.30000001192092896</property>
-            <property name="ypad">16</property>
-            <property name="label" translatable="no"> (text depends on fb username and is modified in the app -
+            <property name="margin_left">16</property>
+            <property name="margin_right">16</property>
+            <property name="margin_top">16</property>
+            <property name="margin_bottom">16</property>
+            <property name="label"> (text depends on fb username and is modified in the app -
 anything put into this field won't display)</property>
           </object>
           <packing>
@@ -40,16 +43,14 @@ anything put into this field won't display)</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="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">create_new_radio</property>
               </object>
               <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>
@@ -58,17 +59,15 @@ anything put into this field won't display)</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_bottom">8</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
               <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>
@@ -77,34 +76,27 @@ anything put into this field won't display)</property>
                 <property name="can_focus">True</property>
                 <property name="margin_bottom">8</property>
                 <property name="invisible_char">●</property>
-                <property name="invisible_char_set">True</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>
               <object class="GtkComboBoxText" id="existing_albums_combo">
                 <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">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="size_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">Upload _size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">resolution_combo</property>
@@ -112,8 +104,6 @@ anything put into this field won't display)</property>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -121,21 +111,17 @@ anything put into this field won't display)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</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">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="visibility_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">Videos and new photo albums _visible to:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">visibility_combo</property>
@@ -143,8 +129,6 @@ anything put into this field won't display)</property>
               <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>
@@ -152,14 +136,10 @@ anything put into this field won't display)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</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">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
@@ -176,8 +156,8 @@ anything put into this field won't display)</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="xalign">0.10000000149011612</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
index e20fb38..dd4c35c 100644
--- a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+++ b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -32,8 +33,7 @@
           <object class="GtkLabel" id="pin_entry_caption">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xpad">1</property>
-            <property name="ypad">1</property>
+            <property name="halign">end</property>
             <property name="label" translatable="yes">Authorization _Number:</property>
             <property name="use_underline">True</property>
             <property name="justify">right</property>
@@ -51,7 +51,6 @@
             <property name="can_focus">True</property>
             <property name="margin_left">8</property>
             <property name="invisible_char">●</property>
-            <property name="invisible_char_set">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -61,41 +60,31 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-      </object>
-      <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkButton" id="continue_button">
         <property name="label" translatable="yes">Con_tinue</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="margin_left">240</property>
         <property name="margin_right">240</property>
         <property name="margin_bottom">160</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="fill">False</property>
+        <property name="pack_type">end</property>
+        <property name="position">2</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/plugins/shotwell-publishing/flickr_publishing_options_pane.ui b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui
index 7f67438..77d32cf 100644
--- a/plugins/shotwell-publishing/flickr_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="flickr_pane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -16,7 +17,7 @@
           <object class="GtkLabel" id="upload_info_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="no">You are logged into Flickr as (name).
+            <property name="label">You are logged into Flickr as (name).
 
 (this label's string is populated and set inside the code,
 so changes made here will not display)</property>
@@ -41,7 +42,8 @@ so changes made here will not display)</property>
               <object class="GtkLabel" id="visibility_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="no">_visibility label (populated in the code)</property>
+                <property name="halign">end</property>
+                <property name="label">_visibility label (populated in the code)</property>
                 <property name="use_underline">True</property>
                 <property name="justify">right</property>
                 <property name="mnemonic_widget">visibility_combo</property>
@@ -49,15 +51,13 @@ so changes made here will not display)</property>
               <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="size_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">Photo _size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">size_combo</property>
@@ -65,36 +65,26 @@ so changes made here will not display)</property>
               <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="GtkComboBoxText" id="visibility_combo">
                 <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">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="size_combo">
                 <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>
@@ -103,17 +93,15 @@ so changes made here will not display)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="margin_top">16</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.17000000178813934</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
index adee4d2..04d3948 100644
--- a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="picasa_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -15,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">32</property>
-        <property name="label" translatable="no">'you are logged in as $name'
+        <property name="label">'you are logged in as $name'
 (populated in the application code)</property>
       </object>
       <packing>
@@ -47,14 +48,10 @@
               <object class="GtkComboBoxText" id="existing_albums_combo">
                 <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>
@@ -66,8 +63,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>
@@ -76,8 +71,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">create_new_radio</property>
@@ -85,8 +80,6 @@
               <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>
@@ -95,17 +88,14 @@
                 <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="yalign">0.47999998927116394</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">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>
@@ -114,39 +104,36 @@
                 <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">1</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="publish_to_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="margin_top">32</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="no">$mediatype will appear in
+                <property name="label">$mediatype will appear in
 (populated in code)</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="margin_top">32</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Photo _size preset:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">size_combo</property>
@@ -154,8 +141,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -163,14 +148,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_top">32</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">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -179,18 +160,16 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="margin_top">16</property>
                 <property name="hexpand">True</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.20000000298023224</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">5</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
index 39c8d7c..82c9018 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="shotwell">
   <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
index bbcd942..397d2ec 100644
--- a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
-  <requires lib="gtk+" version="3.0"/>
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="publishing_options_pane">
     <property name="can_focus">False</property>
     <child>
diff --git a/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
index 8175627..d191025 100644
--- a/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow">
     <property name="can_focus">False</property>
     <child>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index c5b6a4b..7886a92 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing.c generated by valac 0.32.1, the Vala compiler
+/* shotwell-publishing.c generated by valac 0.34.4, the Vala compiler
  * generated from shotwell-publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c
index a8fa711..fb43939 100644
--- a/plugins/shotwell-transitions/BlindsEffect.c
+++ b/plugins/shotwell-transitions/BlindsEffect.c
@@ -1,4 +1,4 @@
-/* BlindsEffect.c generated by valac 0.32.1, the Vala compiler
+/* BlindsEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from BlindsEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c
index a59a2e6..0cb60bf 100644
--- a/plugins/shotwell-transitions/ChessEffect.c
+++ b/plugins/shotwell-transitions/ChessEffect.c
@@ -1,4 +1,4 @@
-/* ChessEffect.c generated by valac 0.32.1, the Vala compiler
+/* ChessEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from ChessEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c
index 0bd66ef..c905549 100644
--- a/plugins/shotwell-transitions/CircleEffect.c
+++ b/plugins/shotwell-transitions/CircleEffect.c
@@ -1,4 +1,4 @@
-/* CircleEffect.c generated by valac 0.32.1, the Vala compiler
+/* CircleEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from CircleEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c
index 542de61..9450def 100644
--- a/plugins/shotwell-transitions/CirclesEffect.c
+++ b/plugins/shotwell-transitions/CirclesEffect.c
@@ -1,4 +1,4 @@
-/* CirclesEffect.c generated by valac 0.32.1, the Vala compiler
+/* CirclesEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from CirclesEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c
index 3074f40..ddf902e 100644
--- a/plugins/shotwell-transitions/ClockEffect.c
+++ b/plugins/shotwell-transitions/ClockEffect.c
@@ -1,4 +1,4 @@
-/* ClockEffect.c generated by valac 0.32.1, the Vala compiler
+/* ClockEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from ClockEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c
index 4fab4db..11f0a95 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.c
+++ b/plugins/shotwell-transitions/CrumbleEffect.c
@@ -1,4 +1,4 @@
-/* CrumbleEffect.c generated by valac 0.32.1, the Vala compiler
+/* CrumbleEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from CrumbleEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c
index 132f3d6..a7f76aa 100644
--- a/plugins/shotwell-transitions/FadeEffect.c
+++ b/plugins/shotwell-transitions/FadeEffect.c
@@ -1,4 +1,4 @@
-/* FadeEffect.c generated by valac 0.32.1, the Vala compiler
+/* FadeEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from FadeEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c
index 1fa1cd3..1797114 100644
--- a/plugins/shotwell-transitions/SlideEffect.c
+++ b/plugins/shotwell-transitions/SlideEffect.c
@@ -1,4 +1,4 @@
-/* SlideEffect.c generated by valac 0.32.1, the Vala compiler
+/* SlideEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from SlideEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c
index 29fab0c..b81172a 100644
--- a/plugins/shotwell-transitions/SquaresEffect.c
+++ b/plugins/shotwell-transitions/SquaresEffect.c
@@ -1,4 +1,4 @@
-/* SquaresEffect.c generated by valac 0.32.1, the Vala compiler
+/* SquaresEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from SquaresEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c
index c6e802d..a4aa40b 100644
--- a/plugins/shotwell-transitions/StripesEffect.c
+++ b/plugins/shotwell-transitions/StripesEffect.c
@@ -1,4 +1,4 @@
-/* StripesEffect.c generated by valac 0.32.1, the Vala compiler
+/* StripesEffect.c generated by valac 0.34.4, the Vala compiler
  * generated from StripesEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c
index 7e6d981..b3a448a 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.c
+++ b/plugins/shotwell-transitions/shotwell-transitions.c
@@ -1,4 +1,4 @@
-/* shotwell-transitions.c generated by valac 0.32.1, the Vala compiler
+/* shotwell-transitions.c generated by valac 0.34.4, the Vala compiler
  * generated from shotwell-transitions.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aeb14af..4d7e209 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,7 +106,6 @@ src/slideshow/TransitionEffects.vala
 src/tags/Branch.vala
 src/Tag.vala
 src/VideoSupport.vala
-ui/appmenu.ui
 ui/collection.ui
 ui/direct_context.ui
 ui/direct.ui
diff --git a/po/cs.gmo b/po/cs.gmo
index a977e62..a5affd1 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 75e0238..13b428e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,8 +17,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-11-22 12:27+0000\n"
-"PO-Revision-Date: 2016-11-22 13:25+0100\n"
+"POT-Creation-Date: 2016-12-23 00:18+0000\n"
+"PO-Revision-Date: 2016-12-24 14:45+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -1385,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:602
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
@@ -1567,96 +1567,94 @@ msgstr "Připravuje se k importu"
 msgid "Core Data Import Services"
 msgstr "Hlavní služby importu dat"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Jít _zpět"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1464
-msgid "_Log in"
-msgstr "_Přihlásit se"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adresa URL _Gallery3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "_Uživatelské jméno:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Jít _zpět"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "_Přihlásit se"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "_Klíč k API:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 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:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: 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
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-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:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: 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 "_Zveřejnit"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Stávající album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "_Nové album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Stávající album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "Před nahráním odstranit identifikační údaje, jako místo, štítky nebo model "
 "fotoaparátu"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Přeškálovat:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "pixely"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Původní velikost"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Šířka nebo výška"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Odhlásit"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
+msgid "_Publish"
+msgstr "_Zveřejnit"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Modul pro zveřejňování v Gallery3"
@@ -1749,49 +1747,49 @@ msgstr "Nerozpoznaný uživatel"
 msgid " Site Not Found"
 msgstr " Server nenalezen"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_E-mailová adresa"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Heslo"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Za_pamatovat"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: 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/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr "_Stávající album:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 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/rajce_publishing_options_pane.ui:141
 #: 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/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otevřít cílové _album v prohlížeči"
@@ -1831,11 +1829,11 @@ msgstr "Fotky se objeví:"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Doplňkové zveřejňovací služby Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogy:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "Veliko_st fotografie:"
@@ -1845,13 +1843,13 @@ 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/FlickrPublishing.vala:1205
 #: 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/FlickrPublishing.vala:1206
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pixelů"
@@ -1928,42 +1926,42 @@ msgstr "Přátelé"
 msgid "Private"
 msgstr "Soukromé"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Alba (nebo vepište nové):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Typ přístupu:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Zakázat _komentáře"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Ne_dovolit stahovat originální fotografii"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Zveřejnit ve stáva_jícím albu:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Vytvořit _nové album s názvem:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "Nahrávaná veliko_st:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2044,17 +2042,17 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Kde chcete vybrané fotografie zveřejnit?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "mě výhradně"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "všem"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -2065,7 +2063,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "Ověřovací _kód:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "Pokračova_t"
 
@@ -2096,8 +2094,8 @@ msgstr ""
 msgid "Preparing for login…"
 msgstr "Připravuje se přihlášení…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
@@ -2105,11 +2103,11 @@ msgstr ""
 "Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na Flickr nemůže "
 "pokračovat."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
 msgid "Verifying authorization…"
 msgstr "Ověřuje se autorizace…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2118,67 +2116,58 @@ msgstr ""
 "Jste přihlášeni ke službě Flickr jako %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, 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] ""
-"Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
-"Tento měsíc vám z přidělené kvóty zbývá %d megabajt."
-msgstr[1] ""
-"Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
-"Tento měsíc vám z přidělené kvóty zbývají %d megabajty."
-msgstr[2] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Váš bezplatný účet Flickr má omezení na množství nahraných dat za měsíc.\n"
-"Tento měsíc vám z přidělené kvóty zbývá %d megabajtů."
+"Tento měsíc vám z přidělené kvóty zbývá %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Účet Flickr Pro umožňuje nahrávat neomezeně."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "Fotky _viditelné pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "Videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "Fotky a videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "přátele a rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "přátele výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixelů"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixelů"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr "_Uvést album ve veřejném seznamu"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr "Předvolená veliko_st fotek:"
 
@@ -2230,7 +2219,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixelů)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:752
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Původní velikost"
 
@@ -2514,16 +2503,16 @@ msgstr "Připíchnout otevřenou nástrojovou lištu"
 msgid "Leave fullscreen"
 msgstr "Opustit režim celé obrazovky"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
 #: 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/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:580
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2536,21 +2525,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:599
+#: src/AppWindow.vala:600
 msgid "Visit the Shotwell web site"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: src/AppWindow.vala:611
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nelze zobrazit nápovědu: %s"
 
-#: src/AppWindow.vala:619
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nelze se připojit k databázi chyb: %s"
 
-#: src/AppWindow.vala:627
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nelze zobrazit časté dotazy a odpovědi: %s"
@@ -2647,18 +2636,26 @@ msgstr "Skrýt již naimportované fotky"
 msgid "Only display photos that have not been imported"
 msgstr "Zobrazit jen fotografie, které ještě nebyly naimportovány"
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:815 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importovat _vše"
+
+#: src/camera/ImportPage.vala:825 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importovat vy_brané"
+
+#: src/camera/ImportPage.vala:849
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Vypadá to, že fotoaparát je prázdný. Nebyly nalezeny žádné fotografie/vide k "
 "naimportování."
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:853
 msgid "No new photos/videos found on camera"
 msgstr "Ve fotoaparátu nejsou žádné nové fotografie/videa"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:999
+#: src/camera/ImportPage.vala:1006
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2666,15 +2663,15 @@ msgstr ""
 "Shotwell potřebuje kvůli přístupu odpojit fotoaparát ze souborového systému. "
 "Pokračovat?"
 
-#: src/camera/ImportPage.vala:1005
+#: src/camera/ImportPage.vala:1012
 msgid "_Unmount"
 msgstr "_Odpojit"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1017
 msgid "Please unmount the camera."
 msgstr "Odpojte prosím fotoaparát."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1022
 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 "
@@ -2684,11 +2681,11 @@ msgstr ""
 "který není blokovaný jinou aplikací. Ukončete všechny aplikace, které ho "
 "používají, a zkuste to znovu."
 
-#: src/camera/ImportPage.vala:1025
+#: src/camera/ImportPage.vala:1032
 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:1030
+#: src/camera/ImportPage.vala:1037
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2697,29 +2694,29 @@ msgstr ""
 "Nelze načíst náhledy z fotoaparátu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1054
 msgid "Unmounting…"
 msgstr "Odpojuje se…"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1145
 msgid "Starting import, please wait…"
 msgstr "Začíná import, čekejte prosím…"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1162
 msgid "Fetching photo information"
 msgstr "Získávají se informace o fotografii"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1520
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získává se náhled pro %s"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1636
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nelze uzamknout fotoaparát: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1721
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2727,7 +2724,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:1717
+#: src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2735,7 +2732,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:1720
+#: src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2743,7 +2740,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:1723
+#: src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2751,15 +2748,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:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1738 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Zachovat"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1757
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňují se fotografie/videa z fotoaparátu"
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1761
 #, 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."
@@ -2851,43 +2848,43 @@ msgstr "Otevřít v editoru RA_W"
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:402
 msgid "Export Photo/Video"
 msgstr "Export fotografie/videa"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:402
 msgid "Export Photos/Videos"
 msgstr "Export fotografií/videí"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
 msgid "Export Photo"
 msgstr "Export fotografie"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:84
+#: src/CollectionPage.vala:404 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Export fotografií"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Rotating"
 msgstr "Otáčí se"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Undoing Rotate"
 msgstr "Vrací se zpět otočení"
 
-#: src/CollectionPage.vala:518
+#: src/CollectionPage.vala:516
 msgid "Flipping Horizontally"
 msgstr "Překlápí se vodorovně"
 
-#: src/CollectionPage.vala:519
+#: src/CollectionPage.vala:517
 msgid "Undoing Flip Horizontally"
 msgstr "Vrací se zpět vodorovné překlopení"
 
-#: src/CollectionPage.vala:528
+#: src/CollectionPage.vala:526
 msgid "Flipping Vertically"
 msgstr "Překlápí se svisle"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:527
 msgid "Undoing Flip Vertically"
 msgstr "Vrací se zpět svislé překlopení"
 
@@ -3104,7 +3101,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Databázový soubor:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
 msgid "_Import"
 msgstr "_Import"
 
@@ -3185,10 +3182,10 @@ msgstr[0] "Tím odstraníte štítek „%s“ z jedné fotografie. Pokračovat?"
 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:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: 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
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "S_mazat"
 
@@ -3672,7 +3669,7 @@ msgstr "Žádné fotografie ani videa nebyly naimportovány.\n"
 msgid "Import Complete"
 msgstr "Import dokončen"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3680,7 +3677,7 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3688,7 +3685,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3696,61 +3693,61 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 den"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Přejmenovat událost"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Název:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Úprava názvu"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:343
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Název:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Úprava komentáře k události"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Úprava komentáře k fotografii/videu"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:631
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Soubor odstranit a přesunou_t do koše"
 msgstr[1] "Soubory odstranit a přesunou_t do koše"
 msgstr[2] "Soubory odstranit a přesunou_t do koše"
 
-#: src/Dialogs.vala:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Odst_ranit z knihovny"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Vrátit zpět externí úpravu?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Vrátit zpět externí úpravy?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3762,15 +3759,15 @@ msgstr[1] ""
 msgstr[2] ""
 "Tím se odstraní všechny změny provedené v %d externích souborech. Pokračovat?"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "_Vrátit zpět externí úpravu"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "_Vrátit zpět externí úpravy"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3778,70 +3775,70 @@ msgstr[0] "Tím se fotka odebere z knihovny. Pokračovat?"
 msgstr[1] "Tím se odeberou %d fotky z knihovny. Pokračovat?"
 msgstr[2] "Tím se odebere %d fotek z knihovny. Pokračovat?"
 
-#: src/Dialogs.vala:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "Odeb_rat"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Odstranit fotografii z knihovny"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Odstranit fotografie z knihovny"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "dop."
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "odp."
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24hod"
 
-#: src/Dialogs.vala:1724
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Posunout fotografie/videa o tu samou hodnotu"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Nastavit tento čas _všem fotkám/videím"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "Z_měnit soubor s originální fotkou"
 msgstr[1] "Z_měnit soubory s originálními fotkami"
 msgstr[2] "Z_měnit soubory s originálními fotkami"
 
-#: src/Dialogs.vala:1739
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "Z_měnit originální soubor"
 msgstr[1] "Z_měnit originální soubory"
 msgstr[2] "Z_měnit originální soubory"
 
-#: src/Dialogs.vala:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Originál:"
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %k∶%M∶%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %l∶%M∶%S %p"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3850,7 +3847,7 @@ msgstr ""
 "Čas expozice bude posunut dopředu\n"
 "o %d %s, %d %s, %d %s a %d %s."
 
-#: src/Dialogs.vala:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3859,35 +3856,35 @@ msgstr ""
 "Čas expozice bude posunut dozadu\n"
 "o %d %s, %d %s, %d %s a %d %s."
 
-#: src/Dialogs.vala:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "den"
 msgstr[1] "dny"
 msgstr[2] "dní"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodinu"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekundu"
 msgstr[1] "sekundy"
 msgstr[2] "sekund"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3910,50 +3907,50 @@ msgstr[2] ""
 "\n"
 "A %d dalších."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Štítky (oddělené čárkou):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Vítejte!"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Vítejte v aplikaci Shotwell"
 
-#: src/Dialogs.vala:2111
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Pro začátek naimportujte fotky libovolným postupem:"
 
-#: src/Dialogs.vala:2131
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "výběrem z nabídky <span weight=\"bold\">Soubor %s Importovat ze složky</span>"
 
-#: src/Dialogs.vala:2132
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "přetažením a upuštěním souborů nad oknem aplikace"
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "připojením fotoaparátu k počítači a importem z něj"
 
-#: src/Dialogs.vala:2144
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importovat fotografie ze složky %s"
 
-#: src/Dialogs.vala:2151
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "Můžete také některým z těchto způsobů importovat fotky:"
 
-#: src/Dialogs.vala:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "Příště _nezobrazovat"
 
-#: src/Dialogs.vala:2199
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importovat fotky z knihovny %s"
@@ -3961,41 +3958,41 @@ msgstr "Importovat fotky z knihovny %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:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(nápověda)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "rok%směsíc%sden"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "rok%směsíc"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "rok%směsíc-den"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "rok-měsíc-den"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:777
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Vlastní"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: src/Dialogs.vala:2590
 msgid "Invalid pattern"
 msgstr "Neplatný vzor"
 
 #. 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4003,31 +4000,31 @@ msgstr ""
 "Shotwell může zkopírovat fotky do knihovny nebo je může importovat bez "
 "kopírování."
 
-#: src/Dialogs.vala:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Ko_pírovat fotky"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importovat bez kopírování"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Import do knihovny"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
 msgid "Remove From Library"
 msgstr "Odstranění z knihovny"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje se fotografie z knihovny"
 
-#: src/Dialogs.vala:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Odstraňují se fotografie z knihovny"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4055,7 +4052,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4083,7 +4080,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4111,7 +4108,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4124,7 +4121,7 @@ msgstr[2] ""
 "%d fotografií/videí nelze přesunout do koše. Mají se soubory smazat?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4194,201 +4191,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:661
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Vrátit se k původním rozměrům fotky"
 
-#: src/editing_tools/EditingTools.vala:664
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Nastaví oříznutí fotografie"
 
-#: src/editing_tools/EditingTools.vala:676
+#: src/editing_tools/EditingTools.vala:681
 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:749
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Neomezeně"
 
-#: src/editing_tools/EditingTools.vala:750
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Čtverec"
 
-#: src/editing_tools/EditingTools.vala:751
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD video (4:3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD video (16:9)"
 
-#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Do peněženky (2 × 3 palce)"
 
-#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Poznámková karta (3 × 5 palců)"
 
-#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4 × 6 palců"
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5 × 7 palců"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8 × 10 palců"
 
-#: src/editing_tools/EditingTools.vala:762
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5 x 11 palců)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11 × 14 palců"
 
-#: src/editing_tools/EditingTools.vala:764
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 palců)"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16 × 20 palců"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Do peněženky (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Pohlednice (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1875 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Zavřít nástroj pro odstranění červených očí"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Odstranit efekt červených očí ve vybrané oblasti"
 
-#: src/editing_tools/EditingTools.vala:2233
+#: src/editing_tools/EditingTools.vala:2238
 #: 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:2247 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Expozice:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Sytost:"
 
-#: src/editing_tools/EditingTools.vala:2274
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Odstín:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: src/editing_tools/EditingTools.vala:2293
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Tmavé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2302
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Světlé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Původní barvy"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Obnovit nastavení barev na původní"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Odstín"
 
-#: src/editing_tools/EditingTools.vala:2741
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2755
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Sytost"
 
-#: src/editing_tools/EditingTools.vala:2768
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Expozice"
 
-#: src/editing_tools/EditingTools.vala:2781
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Tmavé tóny"
 
-#: src/editing_tools/EditingTools.vala:2794
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Světlé tóny"
 
-#: src/editing_tools/EditingTools.vala:2804
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Zvýšení kontrastu"
 
@@ -4501,12 +4498,12 @@ msgstr "Složky"
 msgid "Library"
 msgstr "Knihovna"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Fotografie"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
-#: src/SearchFilter.vala:1104
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Označeno"
 
@@ -4527,19 +4524,19 @@ msgstr "Naimportováno %s"
 msgid "Last Import"
 msgstr "Poslední import"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:505
 msgid "Import From Folder"
 msgstr "Import ze složky"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Vyprázdnění koše"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:574
 msgid "Emptying Trash…"
 msgstr "Vyprazdňuje se koš…"
 
-#: src/library/LibraryWindow.vala:763
+#: src/library/LibraryWindow.vala:770
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4551,33 +4548,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:766 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Umístění knihovny"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:786
 msgid "Photos cannot be imported from this directory."
 msgstr "Z této složky nemohou být fotografie importovány."
 
-#: src/library/LibraryWindow.vala:1059
+#: src/library/LibraryWindow.vala:1066
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d %%)"
 
-#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
+#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
 msgid "Updating library…"
 msgstr "Aktualizuje se knihovna…"
 
-#: src/library/LibraryWindow.vala:1120
+#: src/library/LibraryWindow.vala:1127
 msgid "Preparing to auto-import photos…"
 msgstr "Připravuje se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1125
+#: src/library/LibraryWindow.vala:1132
 msgid "Auto-importing photos…"
 msgstr "Provádí se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1133
+#: src/library/LibraryWindow.vala:1140
 msgid "Writing metadata to files…"
 msgstr "Zapisují se metadata do souborů…"
 
@@ -4697,16 +4694,16 @@ msgstr ""
 "Nelze přehrát vybrané video:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1300
 msgid "No photos/videos"
 msgstr "Žádné fotografie/videa"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1304
 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:2648
+#: src/Page.vala:2610
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nelze exportovat do této složky."
 
@@ -4725,7 +4722,7 @@ msgstr "Následující fotografie"
 msgid "Photo source file missing: %s"
 msgstr "Chybí zdrojový soubor s fotografií: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:2997
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nelze exportovat %s: %s"
@@ -4971,13 +4968,20 @@ msgstr "V nabídce výše vyberte jinou službu, na které se má zkusit zveřej
 
 #. 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
+#: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "Vybrané video bylo úspěšně zveřejněno."
 msgstr[1] "Vybraná videa byla úspěšně zveřejněna."
 msgstr[2] "Vybraná videa byla úspěšně zveřejněna."
 
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Vybrané fotografie byla úspěšně zveřejněna."
+msgstr[1] "Vybrané fotografie byly úspěšně zveřejněny."
+msgstr[2] "Vybrané fotografie byly úspěšně zveřejněny."
+
 #: src/publishing/PublishingUI.vala:115
 msgid "The selected photos/videos were successfully published."
 msgstr "Vybrané fotografie/videa byla úspěšně zveřejněna."
@@ -5103,7 +5107,7 @@ msgstr "_Nápověda"
 msgid "Leave _Fullscreen"
 msgstr "Opustit _celou obrazovku"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Nový"
 
@@ -5595,7 +5599,7 @@ msgstr "Přejme_novat štítek „%s“…"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Přejmenovat štítek „%s“ na „%s“"
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "_Přejmenovat…"
 
@@ -5651,7 +5655,7 @@ 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:410 src/SearchFilter.vala:1125
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Uložené hledání"
 
@@ -5776,14 +5780,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:766
+#: src/Resources.vala:739
 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:771
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e."
@@ -5791,7 +5795,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:776
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e. %B %Y"
@@ -5799,7 +5803,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:781
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %B"
@@ -5807,7 +5811,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:786
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
@@ -5994,7 +5998,7 @@ msgid "Photo state"
 msgstr "Stav fotky"
 
 #: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1115
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Hodnocení"
 
@@ -6022,7 +6026,7 @@ msgstr "Hodnocení ★★★★+"
 msgid "★★★★★+ Rating"
 msgstr "Hodnocení ★★★★★+"
 
-#: src/SearchFilter.vala:1065
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Chyba při načítání uživatelského rozhraním vyhledávací lišty: %s"
@@ -6032,24 +6036,24 @@ msgstr "Chyba při načítání uživatelského rozhraním vyhledávací lišty:
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1074
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Zavřít"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1080
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1087
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Videa"
 
-#: src/SearchFilter.vala:1090
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "Fotografie RAW"
 
-#: src/SearchFilter.vala:1126
+#: src/SearchFilter.vala:1125
 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í"
 
@@ -6332,43 +6336,35 @@ msgstr "_Fotografie"
 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/set_background_dialog.ui:15
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Nastavit jako pozadí plochy"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Použít pro pracovní plochu"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Použít pro zamykací obrazovku"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Nastavit jako prezentaci na ploše"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Vytvořit promítání snímků na pozadí plochy"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Každou fotku zobrazit na"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "násobků času"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Vytvořit promítání snímků na pozadí plochy"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Na jak dlouho se má zobrazit jedna fotografie"
 
diff --git a/po/da.gmo b/po/da.gmo
index e24e7f4..715d49c 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 841bfd5..2c64e0c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # po/shotwell-core/shotwell.pot
 # PO message string template file for Shotwell Core Components
-# Copyright 2016 Software Freedom Conservancy Inc.
+# Copyright 2017 Software Freedom Conservancy Inc.
 # See COPYING for license.
 #
 #
@@ -11,7 +11,7 @@
 # johanneswilm <johanneswilm@gmail.com>, 2011
 # Kris Thomsen <lakristho@gmail.com>, 2011
 # verayin <vera@yorba.org>, 2011
-# Alan Mortensen <alanmortensen.am@gmail.com>, 2016.
+# Alan Mortensen <alanmortensen.am@gmail.com>, 2016, 2017.
 #
 # Konventioner:
 # slideshow -> slideshow (accepteret af RO; MicroSoft har forladt diasshow; dias relaterer sig til lysbilleder)
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15.1\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-26 08:07+0000\n"
-"PO-Revision-Date: 2016-12-08 20:17+0100\n"
+"POT-Creation-Date: 2017-01-10 17:57+0000\n"
+"PO-Revision-Date: 2017-01-14 12:51+0100\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/shotwell/language/"
 "da/)\n"
@@ -1560,96 +1560,94 @@ msgstr "Forbereder import"
 msgid "Core Data Import Services"
 msgstr "Kerne-tjenester til dataimport"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Gå _tilbage"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1464
-msgid "_Log in"
-msgstr "_Log ind"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3-URL:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Bruger_navn:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "Ad_gangskode:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Gå _tilbage"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "_Log ind"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API-_nøgle:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "eller"
 
-#: 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:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: 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
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "_Log ud"
-
-#: 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:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: 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 "_Udgiv"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Et _eksisterende album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "Et _nyt album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Et _eksisterende album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Fjern sted, mærke og samt information som identificerer kameraet før "
 "overførsel"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Skaleringsbegrænsning:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "billedpunkter"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Oprindelig størrelse"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Bredde eller højde"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Log ud"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+msgid "_Publish"
+msgstr "_Udgiv"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Udgivelsesmodul til Gallery3"
@@ -1742,49 +1740,49 @@ msgstr "Bruger ikke genkendt"
 msgid " Site Not Found"
 msgstr "Websted kunne ikke findes"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_E-mail-adresse"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Adgangskode"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Husk"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Log ind"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr "Et _eksisterende album:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr "Et _nyt album med navnet:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Skjul album"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Åbn mål_album i browser"
@@ -1825,11 +1823,11 @@ msgstr "Billeder vil blive vist i:"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwells ekstra udgivelsestjenester"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogs:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "_Billedstørrelse:"
@@ -1839,13 +1837,13 @@ 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/FlickrPublishing.vala:1205
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
 msgstr "500 × 375 billedpunkter"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1206
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 billedpunkter"
@@ -1922,42 +1920,42 @@ msgstr "Venner"
 msgid "Private"
 msgstr "Privat"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Album (eller skriv nyt):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Adgangs_type:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Deaktivér _kommentarer"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Forbyd at oprindeligt billede kan hentes"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Udgiv til et eks_isterende album:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Opret et _nyt album med navnet:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "Overførsels_størrelse:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 msgstr "Videoer og nye fotoalbum _synlige for:"
 
-#: 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2036,17 +2034,17 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Hvor vil du gerne udgive de valgte billeder?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "Kun mig"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Alle"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -2058,7 +2056,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "Godkendelses_nummer:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "For_tsæt"
 
@@ -2088,8 +2086,8 @@ msgstr ""
 msgid "Preparing for login…"
 msgstr "Forbereder på login …"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
@@ -2097,11 +2095,11 @@ msgstr ""
 "En fil, som kræves for at udgive, mangler. Udgivelse til Flickr kan ikke "
 "fortsætte."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
 msgid "Verifying authorization…"
 msgstr "Bekræfter godkendelse …"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2110,66 +2108,59 @@ msgstr ""
 "Du er logget på Flickr som %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, 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] ""
-"Din gratis Flickr-konto begrænser, hvor mange data du kan overføre per "
-"måned.\n"
-"Denne måned har du %d megabyte tilbage i din overførselskvote."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Din gratis Flickr-konto begrænser, hvor mange data du kan overføre per "
 "måned.\n"
-"Denne måned har du %d megabyte tilbage i din overførselskvote."
+"Denne måned har du %s tilbage i din overførselskvote."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Din Flickr Pro-konto giver dig ubegrænset overførsel."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "Billeder _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "Videoer _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "Billeder og videoer _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "Kun venner & familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "Kun familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "Kun venner"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 billedpunkter"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 billedpunkter"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr "V_is album i offentlig galleri"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr "_Standardstørrelse på billede:"
 
@@ -2221,7 +2212,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 billedpunkter)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:752
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Oprindelig størrelse"
 
@@ -2512,7 +2503,7 @@ msgstr "Forlad fuldskærm"
 #: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
 #: 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/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
@@ -2615,8 +2606,8 @@ msgstr "Import mislykkedes (%d)"
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 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"
@@ -2626,7 +2617,7 @@ msgstr "Kamera"
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:458
+#: src/camera/ImportPage.vala:466
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
@@ -2634,25 +2625,33 @@ msgstr ""
 "filhåndteringen."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Skjul allerede importerede billeder"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Vis kun billeder som endnu ikke er blevet importeret"
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importér _valgte"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importér a_lle"
+
+#: src/camera/ImportPage.vala:857
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Kameraet ser ud til at være tomt. Fandt ingen billeder/videoer at importere"
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:861
 msgid "No new photos/videos found on camera"
 msgstr "Fandt ingen nye billeder/videoer på kameraet"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:999
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2660,15 +2659,15 @@ msgstr ""
 "Shotwell har brug for at afmontere kameraet fra filsystemet for at få adgang "
 "til det. Fortsæt?"
 
-#: src/camera/ImportPage.vala:1005
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "A_fmontér"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Afmontér venligst kameraet."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1037
 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 "
@@ -2678,11 +2677,11 @@ msgstr ""
 "det ikke er låst. Luk venligst alle andre programmer, som bruger kameraet, "
 "og forsøg igen."
 
-#: src/camera/ImportPage.vala:1025
+#: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
 msgstr "Luk venligst alle andre programmer, som bruger kameraet."
 
-#: src/camera/ImportPage.vala:1030
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2691,73 +2690,73 @@ msgstr ""
 "Kunne ikke indhente forhåndsvisninger fra kameraet:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr "Afmonterer …"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr "Begynder import. Vent venligst …"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Indhenter billedinformation"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Indhenter forhåndsvisning for %s"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kan ikke låse kamera: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Slet dette billede fra kameraet?"
 msgstr[1] "Slet disse %d billeder fra kameraet?"
 
-#: src/camera/ImportPage.vala:1717
+#: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Slet denne video fra kameraet?"
 msgstr[1] "Slet disse %d videoer fra kameraet?"
 
-#: src/camera/ImportPage.vala:1720
+#: src/camera/ImportPage.vala:1742
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Slet dette billede/denne video fra kameraet?"
 msgstr[1] "Slet disse %d billeder/videoer fra kameraet?"
 
-#: src/camera/ImportPage.vala:1723
+#: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Slette disse filer fra kameraet?"
 msgstr[1] "Slette disse %d filer fra kameraet?"
 
-#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Behold"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Fjern billeder/videoer fra kameraet"
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1776
 #, 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] "Kan ikke slette %d billede/video fra kameraet på grund af fejl."
 msgstr[1] "Kan ikke slette %d billeder/videoer fra kameraet på grund af fejl."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
-#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2460 src/Resources.vala:170
 msgid "_Print"
 msgstr "_Udskriv"
 
@@ -2766,8 +2765,8 @@ msgstr "_Udskriv"
 msgid "Send _To…"
 msgstr "Send _til …"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
-#: src/PhotoPage.vala:2461 src/Resources.vala:220
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2470 src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Angiv som skrivebords_baggrund"
 
@@ -2840,43 +2839,43 @@ msgstr "Åbn med RA_W-redigeringsprogram"
 msgid "_Play"
 msgstr "_Afspil"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Eksportér billede/video"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Eksportér billeder/videoer"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
 msgid "Export Photo"
 msgstr "Eksportér billede"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:84
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Eksportér billeder"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Roterer"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Fortryder rotering"
 
-#: src/CollectionPage.vala:518
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Vender vandret"
 
-#: src/CollectionPage.vala:519
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Fortryder vandret vending"
 
-#: src/CollectionPage.vala:528
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Vender lodret"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Fortryder lodret vending"
 
@@ -3090,7 +3089,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Database-fil:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:769
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "_Importér"
 
@@ -3170,10 +3169,10 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Dette vil fjerne mærket \"%s\" fra et billede. Fortsæt?"
 msgstr[1] "Dette vil fjerne mærket \"%s\" fra %d billeder. Fortsæt?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: 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
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -3623,81 +3622,81 @@ msgstr "Ingen billeder eller videoer importeret.\n"
 msgid "Import Complete"
 msgstr "Import færdig"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutter"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 dag"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Omdøb begivenhed"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Navn:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Redigér titel"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:343
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Redigér kommentar til begivenhed"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Redigér kommentar til billede/video"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:631
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Fjern fil og smid i papirkurven"
 msgstr[1] "_Fjern filer og smid i papirkurven"
 
-#: src/Dialogs.vala:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Fjern fra biblioteket"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Fortryd ekstern redigering?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Fortryd eksterne redigeringer?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3705,83 +3704,83 @@ msgid_plural ""
 msgstr[0] "Dette vil ødelægge alle forandringer i den eksterne fil. Fortsæt?"
 msgstr[1] "Dette vil ødelægge alle forandringer i %d eksterne filer. Fortsæt?"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "For_tryd ekstern redigering"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "For_tryd eksterne redigeringer"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, 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] "Dette vil fjerne billedet fra biblioteket. Fortsæt?"
 msgstr[1] "Dette vil fjerne %d billeder fra biblioteket. Fortsæt?"
 
-#: src/Dialogs.vala:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Fjern billede fra biblioteket"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Fjern billeder fra biblioteket"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 t."
 
-#: src/Dialogs.vala:1724
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Flyt billeder/videoer på samme måde"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Sæt _alle billeder til denne tid"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "_Ændr oprindelig billedfil"
 msgstr[1] "_Ændr oprindelige billedfiler"
 
-#: src/Dialogs.vala:1739
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "_Ændr oprindelig fil"
 msgstr[1] "_Ændr oprindelige filer"
 
-#: src/Dialogs.vala:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Oprindelig: "
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3790,7 +3789,7 @@ msgstr ""
 "Belysningstidspunkt vil blive flyttet fremad med\n"
 "%d %s, %d %s, %d %s, og %d %s."
 
-#: src/Dialogs.vala:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3799,31 +3798,31 @@ msgstr ""
 "Belysningstidspunkt vil blive flyttet tilbage med\n"
 "%d %s, %d %s, %d %s, og %d %s."
 
-#: src/Dialogs.vala:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dage"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3842,49 +3841,49 @@ msgstr[1] ""
 "\n"
 "Og %d andre."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Mærker (adskilt af kommaer):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Velkommen!"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Velkommen til Shotwell!"
 
-#: src/Dialogs.vala:2111
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "For at komme i gang importeres billeder på en af følgende måder:"
 
-#: src/Dialogs.vala:2131
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Vælg <span weight=\"bold\">Import af fil %s fra mappe</span>"
 
-#: src/Dialogs.vala:2132
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Træk og slip billeder i Shotwell-vinduet"
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Forbind et kamera til din computer og importér"
 
-#: src/Dialogs.vala:2144
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importér billeder fra din mappe %s"
 
-#: src/Dialogs.vala:2151
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "Du kan også importere billeder på en af følgende måder:"
 
-#: src/Dialogs.vala:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "_Vis ikke denne besked igen"
 
-#: src/Dialogs.vala:2199
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importér billeder fra dit %s-bibliotek"
@@ -3892,41 +3891,41 @@ msgstr "Importér billeder fra dit %s-bibliotek"
 #. 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:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Hjælp)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "År%småned%sdag"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "År%småned"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "År%småned-dag"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "År-måned-dag"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:777
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Tilpasset"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: src/Dialogs.vala:2590
 msgid "Invalid pattern"
 msgstr "Ugyldigt mønster"
 
 #. 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3934,31 +3933,31 @@ msgstr ""
 "Shotwell kan kopiere billederne ind i din biblioteksmappe eller det kan "
 "importere dem uden at kopiere."
 
-#: src/Dialogs.vala:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Ko_piér billeder"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importér uden at kopiere"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Importér til bibliotek"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
 msgid "Remove From Library"
 msgstr "Fjern fra biblioteket"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
 msgid "Removing Photo From Library"
 msgstr "Fjerner billede fra biblioteket"
 
-#: src/Dialogs.vala:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Fjerner billeder fra bibliotek"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3981,7 +3980,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4004,7 +4003,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4027,7 +4026,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4038,7 +4037,7 @@ msgstr[1] ""
 "%d billeder/videoer kan ikke flyttes til papirkurven. Slet disse filer?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4053,17 +4052,17 @@ msgstr "Bredde"
 msgid "Height"
 msgstr "Højde"
 
-#: src/direct/DirectPhotoPage.vala:92
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s findes ikke."
 
-#: src/direct/DirectPhotoPage.vala:94
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s er ikke en fil."
 
-#: src/direct/DirectPhotoPage.vala:96
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4072,34 +4071,34 @@ msgstr ""
 "%s understøtter ikke filformatet for\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:113
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Kunne ikke åbne billedet %s. Beklager."
 
-#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/direct/DirectPhotoPage.vala:297
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr "_Gem en kopi"
 
-#: src/direct/DirectPhotoPage.vala:300
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Mist ændringer til %s?"
 
-#: src/direct/DirectPhotoPage.vala:301
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr "Luk _uden at gemme"
 
-#: src/direct/DirectPhotoPage.vala:334
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Fejl i forsøget på at gemme til %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
 msgid "Save As"
 msgstr "Gem som"
 
@@ -4109,201 +4108,201 @@ msgstr "Gem som"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Ikke muligt at overvåge %s: Ikke en mappe (%s)"
 
-#: src/editing_tools/EditingTools.vala:661
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Gendan aktuelle billeddimensioner"
 
-#: src/editing_tools/EditingTools.vala:664
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Angiv beskæring på dette billede"
 
-#: src/editing_tools/EditingTools.vala:676
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Drej beskæringsrektanglen mellem stående og liggende"
 
-#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Ubegrænset"
 
-#: src/editing_tools/EditingTools.vala:750
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Firkant"
 
-#: src/editing_tools/EditingTools.vala:751
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Skærm"
 
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD-video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD-video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Tegnebog (2 × 3 in.)"
 
-#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Noteskort (3 × 5 in.)"
 
-#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4 × 6 in."
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5 × 7 in."
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8 × 10 in."
 
-#: src/editing_tools/EditingTools.vala:762
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8.5 × 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11 × 14 in."
 
-#: src/editing_tools/EditingTools.vala:764
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16 × 20 in."
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrisk tegnebog (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postkort (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1875 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Luk værktøjet til rødøje"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Fjern alle rødøjeeffekter i det valgte område"
 
-#: src/editing_tools/EditingTools.vala:2233
+#: src/editing_tools/EditingTools.vala:2238
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Nulstil"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2247 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Belysning:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Mætning:"
 
-#: src/editing_tools/EditingTools.vala:2274
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Nuance:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: src/editing_tools/EditingTools.vala:2293
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Skygger:"
 
-#: src/editing_tools/EditingTools.vala:2302
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Højlys:"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Nulstil farver"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Nulstil alle farvejusteringer til oprindelige farver"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Nuance"
 
-#: src/editing_tools/EditingTools.vala:2741
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2755
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Mætning"
 
-#: src/editing_tools/EditingTools.vala:2768
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Belysning"
 
-#: src/editing_tools/EditingTools.vala:2781
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Skygger"
 
-#: src/editing_tools/EditingTools.vala:2794
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Højlys"
 
-#: src/editing_tools/EditingTools.vala:2804
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Kontrastudvidelse"
 
@@ -4341,31 +4340,31 @@ msgid_plural "%d Photos"
 msgstr[0] "%d billede"
 msgstr[1] "%d billeder"
 
-#: src/events/EventPage.vala:121
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Ingen begivenhed"
 
-#: src/events/EventsDirectoryPage.vala:143
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Ingen begivenheder"
 
-#: src/events/EventsDirectoryPage.vala:147
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Ingen begivenheder fundet"
 
-#: src/events/EventsDirectoryPage.vala:220
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Alle begivenheder"
 
-#: src/events/EventsDirectoryPage.vala:234
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Uden dato"
 
-#: src/events/EventsDirectoryPage.vala:235
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:236
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
@@ -4413,12 +4412,12 @@ msgstr "Mapper"
 msgid "Library"
 msgstr "Bibliotek"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1086
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Billeder"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1105
-#: src/SearchFilter.vala:1106
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Med flag på"
 
@@ -4426,11 +4425,11 @@ msgstr "Med flag på"
 msgid "Importing…"
 msgstr "Importerer …"
 
-#: src/library/ImportQueuePage.vala:122
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "Forbereder import …"
 
-#: src/library/ImportQueuePage.vala:149
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Importerede %s"
@@ -4439,19 +4438,19 @@ msgstr "Importerede %s"
 msgid "Last Import"
 msgstr "Sidste import"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Importér fra mappe"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
 msgstr "Tømmer papirkurven …"
 
-#: src/library/LibraryWindow.vala:766
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4464,33 +4463,33 @@ msgstr ""
 "Indstillinger</span>.\n"
 "Vil du fortsætte med at importere billeder?"
 
-#: src/library/LibraryWindow.vala:769 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Bibliotekets placering"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:782
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Billeder kan ikke importeres fra denne mappe."
 
-#: src/library/LibraryWindow.vala:1062
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1106 src/library/LibraryWindow.vala:1117
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
 msgstr "Opdaterer bibliotek …"
 
-#: src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
 msgstr "Forbereder auto-import af billeder …"
 
-#: src/library/LibraryWindow.vala:1128
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
 msgstr "Auto-importerer billeder …"
 
-#: src/library/LibraryWindow.vala:1136
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
 msgstr "Skriver metadata til filer …"
 
@@ -4498,7 +4497,7 @@ msgstr "Skriver metadata til filer …"
 msgid "Missing Files"
 msgstr "Manglende filer"
 
-#: src/library/OfflinePage.vala:103
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "Sletter …"
 
@@ -4506,15 +4505,15 @@ msgstr "Sletter …"
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: src/library/TrashPage.vala:101
+#: src/library/TrashPage.vala:108
 msgid "Trash is empty"
 msgstr "Papirkurven er tom"
 
-#: src/library/TrashPage.vala:105
+#: src/library/TrashPage.vala:112
 msgid "Delete"
 msgstr "Slet"
 
-#: src/library/TrashPage.vala:106
+#: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
 msgstr "Sletter billeder"
 
@@ -4602,7 +4601,7 @@ msgstr "Kan ikke behandle overvågningsopdateringer: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Justér størrelsen på miniaturebillederne"
 
-#: src/MediaPage.vala:493
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4611,16 +4610,16 @@ msgstr ""
 "Shotwell kunne ikke afspille den valgte video:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1312
 msgid "No photos/videos"
 msgstr "Ingen billeder/videoer"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1316
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 "Der blev ikke fundet nogen billeder/videoer, som matcher det nuværende filter"
 
-#: src/Page.vala:2648
+#: src/Page.vala:2622
 msgid "Photos cannot be exported to this directory."
 msgstr "Billeder kan ikke eksporteres til denne mappe."
 
@@ -4639,7 +4638,7 @@ msgstr "Næste billede"
 msgid "Photo source file missing: %s"
 msgstr "Kildefil for billede mangler: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:3014
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Kunne ikke eksportere %s: %s"
@@ -5023,7 +5022,7 @@ msgstr "_Hjælp"
 msgid "Leave _Fullscreen"
 msgstr "Forlad _fuldskærm"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Nyt"
 
@@ -5516,7 +5515,7 @@ msgstr "Om_døb mærke \"%s\" …"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Omdøb mærke \"%s\" til \"%s\""
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "_Omdøb …"
 
@@ -5569,7 +5568,7 @@ msgstr ""
 "Kunne ikke omdøbe søgningen til \"%s\", fordi søgningen allerede findes."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1127
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Gemt søgning"
 
@@ -5694,14 +5693,14 @@ msgstr "Vælg alle elementer"
 #. / 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:766
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %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:771
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %d. %b"
@@ -5709,7 +5708,7 @@ msgstr "%a %d. %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:776
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -5717,7 +5716,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:781
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %d. %b"
@@ -5725,7 +5724,7 @@ msgstr "%a %d. %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:786
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b. %Y"
@@ -5911,8 +5910,8 @@ msgstr "Flagstatus"
 msgid "Photo state"
 msgstr "Billedtilstand"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:833
-#: src/SearchFilter.vala:1117
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Bedømmelse"
 
@@ -5920,27 +5919,27 @@ msgstr "Bedømmelse"
 msgid "Date"
 msgstr "Dato"
 
-#: src/SearchFilter.vala:817
+#: src/SearchFilter.vala:815
 msgid "★+ Rating"
 msgstr "Bedømmelse ★+"
 
-#: src/SearchFilter.vala:820
+#: src/SearchFilter.vala:818
 msgid "★★+ Rating"
 msgstr "Bedømmelse ★★+"
 
-#: src/SearchFilter.vala:823
+#: src/SearchFilter.vala:821
 msgid "★★★+ Rating"
 msgstr "Bedømmelse ★★★+"
 
-#: src/SearchFilter.vala:826
+#: src/SearchFilter.vala:824
 msgid "★★★★+ Rating"
 msgstr "Bedømmelse ★★★★+"
 
-#: src/SearchFilter.vala:830
+#: src/SearchFilter.vala:828
 msgid "★★★★★+ Rating"
 msgstr "Bedømmelse ★★★★★+"
 
-#: src/SearchFilter.vala:1067
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Fejl under indlæsning af brugerflade til søgebjælke: %s"
@@ -5950,24 +5949,24 @@ msgstr "Fejl under indlæsning af brugerflade til søgebjælke: %s"
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1076
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Luk"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1082
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Type"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Videoer"
 
-#: src/SearchFilter.vala:1092
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "RAW-billeder"
 
-#: src/SearchFilter.vala:1128
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Brug en gemt søgning til at filtrere elementerne i den aktuelle visning"
@@ -6251,43 +6250,35 @@ msgstr "_Billeder"
 msgid "_Stop Import"
 msgstr "_Stop import"
 
-#: ui/import.ui:13 ui/import.ui:210
-msgid "Import _Selected"
-msgstr "Importér _valgte"
-
-#: ui/import.ui:17 ui/import.ui:214
-msgid "Import _All"
-msgstr "Importér a_lle"
-
-#: ui/set_background_dialog.ui:15
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Angiv som skrivebordsbaggrund"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Anvend til skrivebordet"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Anvend til låseskærmen"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Angiv som slideshow på skrivebord"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Opret slideshow til skrivebordets baggrund"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Vis hvert billede i"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "tidsrum"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Opret slideshow til skrivebordets baggrund"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Det tidsrum som hvert billede vises i på skrivebordets baggrund"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index f63f5b2..940d093 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index 64d2483..09d567b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -86,7 +86,7 @@ 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"
-msgstr "샷웰"
+msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
 msgid "Shotwell Viewer"
diff --git a/po/pl.gmo b/po/pl.gmo
index 3022fea..0c001b2 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 4097910..6bbafef 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-11-26 08:07+0000\n"
-"PO-Revision-Date: 2016-11-27 17:25+0100\n"
+"POT-Creation-Date: 2016-12-23 00:18+0000\n"
+"PO-Revision-Date: 2016-12-25 21:38+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -1566,96 +1566,94 @@ msgstr "Przygotowywanie importu"
 msgid "Core Data Import Services"
 msgstr "Usługi importowania głównych danych"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Wstecz"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1464
-msgid "_Log in"
-msgstr "Za_loguj"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adres URL witryny _Gallery3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "_Nazwa użytkownika:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Wstecz"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "Za_loguj"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "_Klucz API:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 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:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: 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
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-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:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: 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"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Istni_ejący album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "_Nowy album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Istni_ejący album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Usunięcie położenia, etykiety, aparatu i innych informacji "
 "identyfikacyjnych przed wysłaniem"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Ograniczenie skalowania:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "piksele"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Oryginalny rozmiar"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Szerokość lub wysokość"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Wyloguj"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
+msgid "_Publish"
+msgstr "Opu_blikuj"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Moduł publikowania w serwisie Gallery3"
@@ -1748,49 +1746,49 @@ msgstr "Nierozpoznany użytkownik"
 msgid " Site Not Found"
 msgstr " Nie odnaleziono witryny"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "Adres _e-mail"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Hasło"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Zapamiętanie"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: 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/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr "Istni_ejącym albumie:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr "_Nowym albumie o nazwie:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: 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/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otwieranie _albumu docelowego w przeglądarce"
@@ -1832,11 +1830,11 @@ msgstr "Zdjęcia pojawią się w:"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Dodatkowe usługi publikowania programu Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogi:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "_Rozmiar zdjęcia:"
@@ -1846,13 +1844,13 @@ 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/FlickrPublishing.vala:1205
 #: 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/FlickrPublishing.vala:1206
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024×768 pikseli"
@@ -1930,42 +1928,42 @@ msgstr "Przyjaciele"
 msgid "Private"
 msgstr "Prywatne"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albumy (lub zapisanie nowego):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Typ dostępu:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Wyłączenie _komentarzy"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Zakazanie pobierania oryginalnego zdjęcia"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Opublikowanie do i_stniejącego albumu:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Utworzenie _nowego albumu o nazwie:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "_Rozmiar wysyłania:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2047,17 +2045,17 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Gdzie opublikować wybrane zdjęcia?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "Tylko dla mnie"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Wszystkich"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -2069,7 +2067,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "_Numer upoważnienia:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "Ko_ntynuuj"
 
@@ -2101,8 +2099,8 @@ msgstr ""
 msgid "Preparing for login…"
 msgstr "Przygotowywanie do zalogowania…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
@@ -2110,11 +2108,11 @@ msgstr ""
 "Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
 "publikowania do serwisu Flickr."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
 msgid "Verifying authorization…"
 msgstr "Sprawdzanie upoważnienia…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2123,70 +2121,59 @@ msgstr ""
 "Zalogowano w serwisie Flickr jako użytkownik %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, 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] ""
-"Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
-"miesiąc.\n"
-"W tym miesiącu pozostało %d megabajt."
-msgstr[1] ""
-"Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
-"miesiąc.\n"
-"W tym miesiącu pozostało %d megabajty."
-msgstr[2] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
 "miesiąc.\n"
-"W tym miesiącu pozostało %d megabajtów."
+"W tym miesiącu pozostało %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Konto Flickr Pro umożliwia nieograniczone wysyłanie."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "Zdjęcia _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "Nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "Zdjęcia i nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "Tylko przyjaciół i rodziny"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "Tylko rodzina"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "Tylko przyjaciele"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048×1536 pikseli"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096×3072 piksele"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr "Wyśw_ietlenie listy albumów w publicznej galerii"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr "Rozmiar _zdjęcia:"
 
@@ -2238,7 +2225,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048×1536 pikseli)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:752
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Oryginalny rozmiar"
 
@@ -2529,7 +2516,7 @@ msgstr "Opuszcza pełny ekran"
 #: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
 #: 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/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
@@ -2659,18 +2646,26 @@ msgstr "Ukrywa już zaimportowane zdjęcia"
 msgid "Only display photos that have not been imported"
 msgstr "Wyświetla tylko zdjęcia, które nie zostały jeszcze zaimportowane"
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:815 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Z_aimportuj wszystkie"
+
+#: src/camera/ImportPage.vala:825 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "_Zaimportuj wybrane"
+
+#: src/camera/ImportPage.vala:849
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Aparat jest pusty. Nie odnaleziono żadnych zdjęć/nagrań wideo do "
 "zaimportowania"
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:853
 msgid "No new photos/videos found on camera"
 msgstr "Nie odnaleziono nowych zdjęć/nagrań wideo w aparacie"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:999
+#: src/camera/ImportPage.vala:1006
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2678,15 +2673,15 @@ msgstr ""
 "Program Shotwell musi odmontować aparat z systemu plików, aby uzyskać do "
 "niego dostęp. Kontynuować?"
 
-#: src/camera/ImportPage.vala:1005
+#: src/camera/ImportPage.vala:1012
 msgid "_Unmount"
 msgstr "Odmont_uj"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1017
 msgid "Please unmount the camera."
 msgstr "Proszę odmontować aparat."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1022
 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 "
@@ -2696,11 +2691,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:1025
+#: src/camera/ImportPage.vala:1032
 msgid "Please close any other application using the camera."
 msgstr "Proszę zamknąć inne programy używające aparatu."
 
-#: src/camera/ImportPage.vala:1030
+#: src/camera/ImportPage.vala:1037
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2709,29 +2704,29 @@ msgstr ""
 "Nie można pobrać podglądu z aparatu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1054
 msgid "Unmounting…"
 msgstr "Odmontowywanie…"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1145
 msgid "Starting import, please wait…"
 msgstr "Rozpoczynanie importowania, proszę czekać…"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1162
 msgid "Fetching photo information"
 msgstr "Pobieranie informacji o zdjęciach"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1520
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Pobieranie podglądu dla %s"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1636
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nie można zablokować aparatu: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1721
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2739,7 +2734,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:1717
+#: src/camera/ImportPage.vala:1724
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2747,7 +2742,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:1720
+#: src/camera/ImportPage.vala:1727
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2755,7 +2750,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:1723
+#: src/camera/ImportPage.vala:1730
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2763,15 +2758,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:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1738 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Zatrzymaj"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1757
 msgid "Removing photos/videos from camera"
 msgstr "Usuwanie zdjęć/nagrań wideo z aparatu"
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1761
 #, 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."
@@ -2864,43 +2859,43 @@ msgstr "Otwórz za pomocą edytora plików _RAW"
 msgid "_Play"
 msgstr "Od_twórz"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:402
 msgid "Export Photo/Video"
 msgstr "Eksport zdjęcia/nagrania wideo"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:402
 msgid "Export Photos/Videos"
 msgstr "Eksport zdjęć/nagrań wideo"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
 msgid "Export Photo"
 msgstr "Eksport zdjęcia"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:84
+#: src/CollectionPage.vala:404 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Eksport zdjęć"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Rotating"
 msgstr "Obracanie"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Undoing Rotate"
 msgstr "Cofanie obrotu"
 
-#: src/CollectionPage.vala:518
+#: src/CollectionPage.vala:516
 msgid "Flipping Horizontally"
 msgstr "Odwracanie poziome"
 
-#: src/CollectionPage.vala:519
+#: src/CollectionPage.vala:517
 msgid "Undoing Flip Horizontally"
 msgstr "Cofanie odwrócenia poziomego"
 
-#: src/CollectionPage.vala:528
+#: src/CollectionPage.vala:526
 msgid "Flipping Vertically"
 msgstr "Odwracanie pionowe"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:527
 msgid "Undoing Flip Vertically"
 msgstr "Cofanie odwrócenia pionowego"
 
@@ -3118,7 +3113,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Plik bazy danych:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:769
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
 msgid "_Import"
 msgstr "Zai_mportuj"
 
@@ -3199,10 +3194,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:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: 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
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -3745,7 +3740,7 @@ msgstr "Nie zaimportowano żadnych zdjęć lub nagrań wideo.\n"
 msgid "Import Complete"
 msgstr "Ukończono importowanie"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3753,7 +3748,7 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3761,7 +3756,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3769,61 +3764,61 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "dzień"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Zmień nazwę wydarzenia"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Modyfikacja tytułu"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:343
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Tytuł:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Modyfikuj komentarz wydarzenia"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Modyfikuj komentarz zdjęcia/nagrania wideo"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:631
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 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:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Usuń z kolekcji"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Odwrócić zewnętrzną modyfikację?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Odwrócić zewnętrzne modyfikacje?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3837,15 +3832,15 @@ msgstr[2] ""
 "Unieważni to wszystkie zmiany wprowadzone do %d zewnętrznych plików. "
 "Kontynuować?"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Od_wróć zewnętrzną modyfikację"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Od_wróć zewnętrzne modyfikacje"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3853,70 +3848,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:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24-godzinny"
 
-#: src/Dialogs.vala:1724
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "Prze_suń zdjęcia/nagrania wideo o tę samą wartość"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Ust_aw wszystkie zdjęcia/nagrania wideo na ten czas"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
 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:1739
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "_Modyfikuj oryginalny plik"
 msgstr[1] "_Modyfikuj oryginalne pliki"
 msgstr[2] "_Modyfikuj oryginalne pliki"
 
-#: src/Dialogs.vala:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Oryginał: "
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d %b %Y, %H∶%M∶%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d %b %Y, %I∶%M∶%S %p"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3925,7 +3920,7 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do przodu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3934,35 +3929,35 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do tyłu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dzień"
 msgstr[1] "dni"
 msgstr[2] "dni"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
 msgstr[1] "sekundy"
 msgstr[2] "sekund"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3985,50 +3980,50 @@ msgstr[2] ""
 "\n"
 "Oraz %d innych."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Etykiety (oddzielone przecinkami):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Witamy"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Witamy w programie Shotwell"
 
-#: src/Dialogs.vala:2111
+#: src/Dialogs.vala:2101
 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:2131
+#: src/Dialogs.vala:2121
 #, 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:2132
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Przeniesienie zdjęć do okna programu Shotwell"
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Połączenie aparatu do komputera i zaimportowanie"
 
-#: src/Dialogs.vala:2144
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Zaimportuj zdjęcia z katalogu %s"
 
-#: src/Dialogs.vala:2151
+#: src/Dialogs.vala:2141
 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:"
 
-#: src/Dialogs.vala:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "_Bez wyświetlania tego komunikatu ponownie"
 
-#: src/Dialogs.vala:2199
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Import zdjęć z kolekcji programu %s"
@@ -4036,41 +4031,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:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Pomoc)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%smiesiąc%sdzień"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%smiesiąc"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%smiesiąc-dzień"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Rok-miesiąc-dzień"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:777
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Własny"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: src/Dialogs.vala:2590
 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4078,31 +4073,31 @@ msgstr ""
 "Program Shotwell może skopiować zdjęcia do katalogu kolekcji lub może "
 "zaimportować je bez tworzenia ich kopii."
 
-#: src/Dialogs.vala:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "_Skopiowanie zdjęć"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Zaimportowanie"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Zaimportuj do kolekcji"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
 msgid "Remove From Library"
 msgstr "Usuń z kolekcji"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
 msgid "Removing Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: src/Dialogs.vala:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4130,7 +4125,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4158,7 +4153,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4186,7 +4181,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4200,7 +4195,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:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4272,201 +4267,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:661
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Powraca do bieżących wymiarów zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:664
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Ustawia przycięcie tego zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:676
+#: src/editing_tools/EditingTools.vala:681
 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:749
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Niewymuszony"
 
-#: src/editing_tools/EditingTools.vala:750
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Kwadratowy"
 
-#: src/editing_tools/EditingTools.vala:751
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "Plik wideo SD (4∶3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "Plik wideo HD (16∶9)"
 
-#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Portfel (2×3 cale)"
 
-#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notatka (3×5 cali)"
 
-#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4×6 cali"
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5×7 cali"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8×10 cali"
 
-#: src/editing_tools/EditingTools.vala:762
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5×11 cali)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11×14 cali"
 
-#: src/editing_tools/EditingTools.vala:764
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11×17 cali)"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16×20 cali"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Portfel metryczny (9×13 cm)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Kartka pocztowa (10×15 cm)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13×18 cm"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18×24 cm"
 
-#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210×297 mm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20×30 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24×40 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30×40 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297×420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1875 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Zamyka narzędzie usuwania czerwonych oczu"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Usuwa wszystkie efekty czerwonych oczu na wybranym obszarze"
 
-#: src/editing_tools/EditingTools.vala:2233
+#: src/editing_tools/EditingTools.vala:2238
 #: 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:2247 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Ekspozycja:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Nasycenie:"
 
-#: src/editing_tools/EditingTools.vala:2274
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Odcień:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2293
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Cienie:"
 
-#: src/editing_tools/EditingTools.vala:2302
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Wyróżnienia:"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Przywróć kolory"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Przywraca wszystkie dostosowania kolorów do oryginalnych"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Odcień"
 
-#: src/editing_tools/EditingTools.vala:2741
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2755
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: src/editing_tools/EditingTools.vala:2768
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: src/editing_tools/EditingTools.vala:2781
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Cienie"
 
-#: src/editing_tools/EditingTools.vala:2794
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Wyróżnienia"
 
-#: src/editing_tools/EditingTools.vala:2804
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Rozszerzenie kontrastu"
 
@@ -4579,12 +4574,12 @@ msgstr "Katalogi"
 msgid "Library"
 msgstr "Kolekcja"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1086
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Zdjęcia"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1105
-#: src/SearchFilter.vala:1106
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Oznaczone flagą"
 
@@ -4605,19 +4600,19 @@ msgstr "Zaimportowano %s"
 msgid "Last Import"
 msgstr "Ostatni import"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:505
 msgid "Import From Folder"
 msgstr "Importowanie z katalogu"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:574
 msgid "Emptying Trash…"
 msgstr "Opróżnianie kosza…"
 
-#: src/library/LibraryWindow.vala:766
+#: src/library/LibraryWindow.vala:770
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4631,33 +4626,33 @@ msgstr ""
 "Preferencje</span>.\n"
 "Kontynuować importowanie zdjęć?"
 
-#: src/library/LibraryWindow.vala:769 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Położenie kolekcji"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:782
+#: src/library/LibraryWindow.vala:786
 msgid "Photos cannot be imported from this directory."
 msgstr "Nie można importować zdjęć z tego katalogu."
 
-#: src/library/LibraryWindow.vala:1062
+#: src/library/LibraryWindow.vala:1066
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1106 src/library/LibraryWindow.vala:1117
+#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
 msgid "Updating library…"
 msgstr "Aktualizowanie kolekcji…"
 
-#: src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1127
 msgid "Preparing to auto-import photos…"
 msgstr "Przygotowywanie do automatycznego zaimportowania zdjęć…"
 
-#: src/library/LibraryWindow.vala:1128
+#: src/library/LibraryWindow.vala:1132
 msgid "Auto-importing photos…"
 msgstr "Automatyczne importowanie zdjęć…"
 
-#: src/library/LibraryWindow.vala:1136
+#: src/library/LibraryWindow.vala:1140
 msgid "Writing metadata to files…"
 msgstr "Zapisywanie metadanych do plików…"
 
@@ -4780,15 +4775,15 @@ msgstr ""
 "Program Shotwell nie może odtworzyć wybranego nagrania wideo:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1300
 msgid "No photos/videos"
 msgstr "Brak zdjęć/nagrań wideo"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1304
 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:2648
+#: src/Page.vala:2610
 msgid "Photos cannot be exported to this directory."
 msgstr "Nie można eksportować zdjęć do tego katalogu."
 
@@ -4807,7 +4802,7 @@ msgstr "Następne zdjęcie"
 msgid "Photo source file missing: %s"
 msgstr "Brak pliku źródłowego zdjęcia: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:2997
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nie można wyeksportować: %s: %s"
@@ -5194,7 +5189,7 @@ msgstr "Pomo_c"
 msgid "Leave _Fullscreen"
 msgstr "Opuść p_ełny ekran"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Nowa"
 
@@ -5688,7 +5683,7 @@ msgstr "Zmień _nazwę etykiety „%s”…"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Zmień nazwę etykiety „%s” na „%s”"
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "_Zmień nazwę…"
 
@@ -5747,7 +5742,7 @@ msgstr ""
 "już istnieje."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1127
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Zapisane wyszukiwanie"
 
@@ -5872,14 +5867,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:766
+#: src/Resources.vala:739
 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:771
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -5887,7 +5882,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:776
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e, %Y"
@@ -5895,7 +5890,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:781
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -5903,7 +5898,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:786
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e %b %Y"
@@ -6089,8 +6084,8 @@ msgstr "Stan flagi"
 msgid "Photo state"
 msgstr "Stan zdjęcia"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:833
-#: src/SearchFilter.vala:1117
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Ocena"
 
@@ -6098,27 +6093,27 @@ msgstr "Ocena"
 msgid "Date"
 msgstr "Data"
 
-#: src/SearchFilter.vala:817
+#: src/SearchFilter.vala:815
 msgid "★+ Rating"
 msgstr "Ocena ★+"
 
-#: src/SearchFilter.vala:820
+#: src/SearchFilter.vala:818
 msgid "★★+ Rating"
 msgstr "Ocena ★★+"
 
-#: src/SearchFilter.vala:823
+#: src/SearchFilter.vala:821
 msgid "★★★+ Rating"
 msgstr "Ocena ★★★+"
 
-#: src/SearchFilter.vala:826
+#: src/SearchFilter.vala:824
 msgid "★★★★+ Rating"
 msgstr "Ocena ★★★★+"
 
-#: src/SearchFilter.vala:830
+#: src/SearchFilter.vala:828
 msgid "★★★★★+ Rating"
 msgstr "Ocena ★★★★★+"
 
-#: src/SearchFilter.vala:1067
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Błąd podczas wczytywania interfejsu użytkownika paska wyszukiwania: %s"
@@ -6128,24 +6123,24 @@ msgstr "Błąd podczas wczytywania interfejsu użytkownika paska wyszukiwania: %
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1076
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Zamknij"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1082
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Nagrania wideo"
 
-#: src/SearchFilter.vala:1092
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "Zdjęcia RAW"
 
-#: src/SearchFilter.vala:1128
+#: src/SearchFilter.vala:1125
 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"
@@ -6429,43 +6424,35 @@ msgstr "_Zdjęcia"
 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/set_background_dialog.ui:15
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Ustaw jako tło pulpitu"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Użycie na pulpicie"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Użycie na ekranie blokady"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Ustaw jako pokaz slajdów pulpitu"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Utwórz pokaz slajdów tła pulpitu"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Wyświetlanie każdego zdjęcia przez"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "czas"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Utwórz pokaz slajdów tła pulpitu"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Jak długo każde zdjęcie jest wyświetlane jako tło pulpitu"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 3040651..a7c2443 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edd89b4..fa78166 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-11-18 22:18-0200\n"
-"PO-Revision-Date: 2016-11-18 23:32-0200\n"
+"POT-Creation-Date: 2016-12-23 00:18+0000\n"
+"PO-Revision-Date: 2016-12-26 07:07-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"
@@ -27,7 +27,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: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
@@ -1414,7 +1414,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Visitar o site do Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:597
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
 msgid "translator-credits"
 msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
@@ -1431,8 +1431,7 @@ 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
@@ -1440,16 +1439,15 @@ msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
 msgstr ""
-"⚫ A identificação deste site é muito antiga para ser confiável. "
-"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 emitida 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
@@ -1465,8 +1463,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
@@ -1483,8 +1481,8 @@ 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 somente é válida para datas futuras. Por "
-"favor, verifique a data no calendário do 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:959
@@ -1601,96 +1599,94 @@ msgstr "Preparando para importar"
 msgid "Core Data Import Services"
 msgstr "Núcleo serviços de importação de dados"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Voltar"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1630
-msgid "_Log in"
-msgstr "A_utenticar"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL de _Gallery3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "_Nome do usuário:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Voltar"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "A_utenticar"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "_Chave de API:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 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:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: 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
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-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:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: 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"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Um álbum _existente"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "Um _novo álbum"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Um álbum _existente"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Remover localização, etiquetas e dados identificadores da câmera antes de "
 "enviar"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Restrição de dimensionamento:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "pixels"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Tamanho original"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Largura ou altura"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Sair"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
+msgid "_Publish"
+msgstr "_Publicar"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Módulo de publicação do Gallery3"
@@ -1784,49 +1780,49 @@ msgstr "Usuário não reconhecido"
 msgid " Site Not Found"
 msgstr " Site não encontrado"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_Endereço de e-mail"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Senha"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Lemb_rar"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: 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/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr "Um álbum _existente:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr "Um _novo álbum chamado:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: 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/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "_Abrir álbum alvo no navegador"
@@ -1867,11 +1863,11 @@ msgstr "As fotos irão aparecer em:"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Serviços extras de publicação do Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogs:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "Tamanho da _foto:"
@@ -1881,13 +1877,13 @@ 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/FlickrPublishing.vala:1205
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
 msgstr "500 × 375 pixels"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1206
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pixels"
@@ -1963,42 +1959,42 @@ msgstr "Amigos"
 msgid "Private"
 msgstr "Privado"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "Á_lbuns (ou gravar novo):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Tipo de acesso:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Desabilitar _comentários"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Proibir o _download da foto original"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Publicar em um álbum e_xistente:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Criar um _novo álbum chamado:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "Tama_nho de upload:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2078,17 +2074,17 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Onde você gostaria de publicar as fotos selecionadas?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "Somente para mim"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Todos"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -2100,7 +2096,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "_Número de autorização:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "Con_tinuar"
 
@@ -2130,8 +2126,8 @@ msgstr ""
 msgid "Preparing for login…"
 msgstr "Preparando para iniciar sessão…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
@@ -2139,11 +2135,11 @@ msgstr ""
 "O arquivo necessário para a publicação não está disponível. A publicação "
 "para o Flickr não pode continuar."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
 msgid "Verifying authorization…"
 msgstr "Verificando autorização…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2152,64 +2148,64 @@ msgstr ""
 "Você está autenticado no Flickr como %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, 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."
 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] ""
-"Sua conta gratuita do Flickr limita quantos dados você pode enviar por mês.\n"
-"Este mês, você possui %d megabyte restante na sua cota de envio."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Sua conta gratuita do Flickr limita quantos dados você pode enviar por mês.\n"
-"Este mês, você possui %d megabytes restantes na sua cota de envio."
+"Este mês, ainda há %s na sua cota de envio."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Sua conta Pro do Flickr oferece a você uploads ilimitados."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "Fotos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "Vídeos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "Fotos e vídeos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "Somente amigos e família"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "Somente família"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "Somente amigos"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixels"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixels"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr "L_istar os álbuns na galeria pública"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr "Tama_nho pré-definido da foto:"
 
@@ -2260,7 +2256,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixels)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Tamanho original"
 
@@ -2533,28 +2529,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:45
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Fixar a barra de ferramentas"
 
-#: src/AppWindow.vala:46
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Fixar a barra de ferramentas aberta"
 
-#: src/AppWindow.vala:51
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Sai da tela cheia"
 
-#: src/AppWindow.vala:526 src/AppWindow.vala:547 src/AppWindow.vala:564
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
 #: 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/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/AppWindow.vala:574
+#: src/AppWindow.vala:580
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2567,21 +2563,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:594
+#: src/AppWindow.vala:600
 msgid "Visit the Shotwell web site"
 msgstr "Visitar o página web do Shotwell"
 
-#: src/AppWindow.vala:606
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Não foi possível exibir a ajuda: %s"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, 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:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Não foi possível exibir FAQ: %s"
@@ -2658,7 +2654,7 @@ msgstr "Câmeras"
 msgid "Camera"
 msgstr "Câmera"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
@@ -2678,16 +2674,24 @@ msgstr "Ocultar fotos já importadas"
 msgid "Only display photos that have not been imported"
 msgstr "Somente exibir fotos que não foram importadas"
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:815 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importar _todas"
+
+#: src/camera/ImportPage.vala:825 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importar _selecionadas"
+
+#: src/camera/ImportPage.vala:849
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "A câmera parece está vazia. Não há fotos ou vídeos para importar"
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:853
 msgid "No new photos/videos found on camera"
 msgstr "Sem fotos/vídeos na câmera"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:999
+#: src/camera/ImportPage.vala:1006
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2695,15 +2699,15 @@ msgstr ""
 "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-la. "
 "Continuar?"
 
-#: src/camera/ImportPage.vala:1005
+#: src/camera/ImportPage.vala:1012
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1017
 msgid "Please unmount the camera."
 msgstr "Por favor, desmonte a câmera."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1022
 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,12 +2717,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:1025
+#: src/camera/ImportPage.vala:1032
 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:1030
+#: src/camera/ImportPage.vala:1037
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2727,65 +2731,65 @@ msgstr ""
 "Não foi possível obter pré-visualizações da câmera:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1054
 msgid "Unmounting…"
 msgstr "Desmontando…"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1145
 msgid "Starting import, please wait…"
 msgstr "Iniciando importação, por favor, aguarde…"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1162
 msgid "Fetching photo information"
 msgstr "Obtendo informação da foto"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1520
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obtendo visualização para %s"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1636
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Não foi possível travar a câmera: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1721
 #, 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:1717
+#: src/camera/ImportPage.vala:1724
 #, 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:1720
+#: src/camera/ImportPage.vala:1727
 #, 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:1723
+#: src/camera/ImportPage.vala:1730
 #, 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:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1738 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Manter"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1757
 msgid "Removing photos/videos from camera"
 msgstr "Excluindo fotos/vídeos da câmera"
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1761
 #, 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."
@@ -2798,7 +2802,7 @@ 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
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Enviar _para…"
 
@@ -2840,13 +2844,13 @@ 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/direct_context.ui:9 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/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 "Re_verter para o original"
@@ -2876,43 +2880,43 @@ msgstr "Abrir com editor de RA_W"
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/CollectionPage.vala:399
+#: src/CollectionPage.vala:402
 msgid "Export Photo/Video"
 msgstr "Exportar foto/vídeo"
 
-#: src/CollectionPage.vala:399
+#: src/CollectionPage.vala:402
 msgid "Export Photos/Videos"
 msgstr "Exportar fotos/vídeos"
 
-#: src/CollectionPage.vala:401 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
 msgid "Export Photo"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:401 src/Dialogs.vala:84
+#: src/CollectionPage.vala:404 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Rotating"
 msgstr "Girando"
 
-#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Undoing Rotate"
 msgstr "Desfazendo rotação"
 
-#: src/CollectionPage.vala:513
+#: src/CollectionPage.vala:516
 msgid "Flipping Horizontally"
 msgstr "Invertendo horizontalmente"
 
-#: src/CollectionPage.vala:514
+#: src/CollectionPage.vala:517
 msgid "Undoing Flip Horizontally"
 msgstr "Desfazendo inversão horizontal"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:526
 msgid "Flipping Vertically"
 msgstr "Invertendo verticalmente"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:527
 msgid "Undoing Flip Vertically"
 msgstr "Desfazendo inversão vertical"
 
@@ -3126,7 +3130,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Arquivo de banco de dados:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
 msgid "_Import"
 msgstr "Parar _importação"
 
@@ -3208,10 +3212,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:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: 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
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Apagar"
 
@@ -3673,81 +3677,81 @@ msgstr "Sem fotos ou vídeos importados.\n"
 msgid "Import Complete"
 msgstr "Importação concluída"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutes"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 dia"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Renomear evento"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Nome:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Editar título"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Título:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Editar comentário de evento"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Editar comentário de foto/vídeo"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 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:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Remover da biblioteca"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Reverter edição externa?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Reverter edições externas?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3759,83 +3763,83 @@ msgstr[1] ""
 "Isto irá destruir todas as alterações feitas para %d arquivos externos. "
 "Continuar?"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Re_verter edição externa"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Re_verter edições externas"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, 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:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 Hr"
 
-#: src/Dialogs.vala:1724
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "De_slocar fotos/vídeos pelo mesmo montante"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Definir tod_as fotos/vídeos para a mesma hora"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "_Modificar arquivo original da foto"
 msgstr[1] "_Modificar arquivos originais da foto"
 
-#: src/Dialogs.vala:1739
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "_Modificar original"
 msgstr[1] "_Modificar originais"
 
-#: src/Dialogs.vala:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Original: "
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3844,7 +3848,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:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3853,31 +3857,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:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3896,49 +3900,49 @@ msgstr[1] ""
 "\n"
 "e %d outras."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Etiquetas (separadas por vírgulas):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Bem-vindo!"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Bem-vindo ao Shotwell!"
 
-#: src/Dialogs.vala:2111
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Para iniciar, importe fotos de alguma destas formas:"
 
-#: src/Dialogs.vala:2131
+#: src/Dialogs.vala:2121
 #, c-format
 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:2132
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Arraste e solte fotos para dentro da janela do Shotwell"
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Conectar uma câmera no seu computador e importe"
 
-#: src/Dialogs.vala:2144
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importar fotos de seu diretório %s"
 
-#: src/Dialogs.vala:2151
+#: src/Dialogs.vala:2141
 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:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "_Não mostrar esta mensagem novamente"
 
-#: src/Dialogs.vala:2199
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importar fotos de sua biblioteca %s"
@@ -3946,41 +3950,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:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Ajuda)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Ano%sMês%sDia"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Ano%sMês"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Ano%sMês-Dia"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Ano-Mês-Dia"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:780
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Personalizar"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: src/Dialogs.vala:2590
 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3988,31 +3992,31 @@ msgstr ""
 "Shotwell pode copiar as fotos na sua pasta de biblioteca ou pode importá-los "
 "sem copiar."
 
-#: src/Dialogs.vala:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Co_piar fotos"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importar no local"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Importar para a biblioteca"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
 msgid "Remove From Library"
 msgstr "Remover da biblioteca"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
 msgid "Removing Photo From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4035,7 +4039,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4058,7 +4062,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4081,18 +4085,19 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, 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:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4163,201 +4168,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:664
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Retornar a foto para as dimensões atuais"
 
-#: src/editing_tools/EditingTools.vala:667
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Definir o corte para esta foto"
 
-#: src/editing_tools/EditingTools.vala:679
+#: src/editing_tools/EditingTools.vala:681
 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:752
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Sem restrições"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Quadrado"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Tela"
 
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:759
-#: src/editing_tools/EditingTools.vala:769
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD Video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD Video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Carteira (2 × 3 pol.)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Cartão de notas (3 × 5 pol.)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4 × 6 pol."
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5 × 7 pol."
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8 × 10 pol."
 
-#: src/editing_tools/EditingTools.vala:765
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Carta (8.5 × 11 pol.)"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11 × 14 pol."
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloide (11 × 17 pol.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16 × 20 pol."
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Carteira métrica (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Cartão postal (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:774
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1878 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Fechar ferramenta de olhos vermelhos"
 
-#: src/editing_tools/EditingTools.vala:1896
+#: src/editing_tools/EditingTools.vala:1898
 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:2236
+#: src/editing_tools/EditingTools.vala:2238
 #: 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:2250 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Exposição:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Contraste:"
 
-#: src/editing_tools/EditingTools.vala:2268
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Saturação:"
 
-#: src/editing_tools/EditingTools.vala:2277
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Colorir:"
 
-#: src/editing_tools/EditingTools.vala:2287
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2296
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Sombras:"
 
-#: src/editing_tools/EditingTools.vala:2305
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Destaques:"
 
-#: src/editing_tools/EditingTools.vala:2361
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Reiniciar cores"
 
-#: src/editing_tools/EditingTools.vala:2361
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Reiniciar todos os ajustes de cores para o original"
 
-#: src/editing_tools/EditingTools.vala:2720
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2732
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Colorir"
 
-#: src/editing_tools/EditingTools.vala:2744
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/editing_tools/EditingTools.vala:2758
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Saturação"
 
-#: src/editing_tools/EditingTools.vala:2771
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Exposição"
 
-#: src/editing_tools/EditingTools.vala:2784
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Sombras"
 
-#: src/editing_tools/EditingTools.vala:2797
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Destaques"
 
-#: src/editing_tools/EditingTools.vala:2807
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Expansão de contraste"
 
@@ -4381,14 +4386,14 @@ msgid_plural "%d Photos/Videos"
 msgstr[0] "%d fotos/vídeos"
 msgstr[1] "%d foto/vídeo"
 
-#: 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] "%d vídeo"
 msgstr[1] "%d vídeos"
 
-#: 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"
@@ -4463,16 +4468,16 @@ msgstr "Exportar"
 msgid "Folders"
 msgstr "Pastas"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1194
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Fotos"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
-#: src/SearchFilter.vala:1104
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Marcadas"
 
@@ -4493,19 +4498,19 @@ msgstr "Importado %s"
 msgid "Last Import"
 msgstr "Última importação"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:505
 msgid "Import From Folder"
 msgstr "Importa da pasta"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:574
 msgid "Emptying Trash…"
 msgstr "Esvaziando lixeira…"
 
-#: src/library/LibraryWindow.vala:763
+#: src/library/LibraryWindow.vala:770
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4518,33 +4523,33 @@ msgstr ""
 "%s</span>.\n"
 "Você deseja continuar a importação de fotos?"
 
-#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Localização da biblioteca"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:786
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotos não podem ser importadas deste diretório."
 
-#: src/library/LibraryWindow.vala:1059
+#: src/library/LibraryWindow.vala:1066
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
+#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
 msgid "Updating library…"
 msgstr "Atualizando biblioteca…"
 
-#: src/library/LibraryWindow.vala:1120
+#: src/library/LibraryWindow.vala:1127
 msgid "Preparing to auto-import photos…"
 msgstr "Preparando para auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1125
+#: src/library/LibraryWindow.vala:1132
 msgid "Auto-importing photos…"
 msgstr "Auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1133
+#: src/library/LibraryWindow.vala:1140
 msgid "Writing metadata to files…"
 msgstr "Escrevendo metadados para arquivos…"
 
@@ -4580,8 +4585,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
@@ -4590,8 +4595,8 @@ 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 "
+"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
@@ -4603,8 +4608,9 @@ 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
@@ -4667,15 +4673,15 @@ msgstr ""
 "Shotwell foi incapaz de reproduzir o vídeo selecionado:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1300
 msgid "No photos/videos"
 msgstr "Sem fotos/vídeos"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1304
 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:2648
+#: src/Page.vala:2610
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos não podem ser exportadas para este diretório."
 
@@ -4694,7 +4700,7 @@ msgstr "Próxima foto"
 msgid "Photo source file missing: %s"
 msgstr "Faltando arquivo fonte da foto: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:2997
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Não foi possível exportar %s: %s"
@@ -4798,19 +4804,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Hoje"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Itens:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -4818,104 +4824,104 @@ msgstr[0] "%d evento"
 msgstr[1] "%d eventos"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Data:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Hora:"
 
 #. 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 "De:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Para:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Duração:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Desenvolvedor:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Localização:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Tamanho do arquivo:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Desenvolvimento atual:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Dimensões originais:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Câmera:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Modelo da câmera:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Flash:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Comprimento focal:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Data de exposição:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Horário da exposição:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Exposição bias:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Latitude do GPS:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Longitude do GPS:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Artista:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Software:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Informações estendidas"
 
@@ -4939,12 +4945,19 @@ msgstr "Para tentar publicar em outro serviço, selecione-o no menu acima."
 
 #. 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
+#: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
 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:109
+#| msgid "The selected photo was successfully published."
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "A foto selecionada foi publicada com sucesso."
+msgstr[1] "As fotos selecionadas foram publicadas 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."
@@ -5070,7 +5083,7 @@ msgstr "A_juda"
 msgid "Leave _Fullscreen"
 msgstr "Sair da _tela cheia"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Nova"
 
@@ -5564,7 +5577,7 @@ msgstr "Re_nomear etiqueta “%s”…"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Renomear a etiqueta “%s” para “%s”"
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "_Renomear…"
 
@@ -5620,7 +5633,7 @@ msgstr ""
 "existir."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1125
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Pesquisa salva"
 
@@ -5628,11 +5641,11 @@ msgstr "Pesquisa salva"
 msgid "Delete Search"
 msgstr "Apagar pesquisa"
 
-#: src/Resources.vala:415 ui/savedsearch.ui:12
+#: src/Resources.vala:415 ui/savedsearch.ui:11
 msgid "_Edit…"
 msgstr "_Editar…"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:8
+#: src/Resources.vala:416 ui/savedsearch.ui:7
 msgid "Re_name…"
 msgstr "Re_nomear…"
 
@@ -5702,7 +5715,7 @@ msgstr "_Restaurar"
 msgid "Move the selected photos back into the library"
 msgstr "Mover as fotos selecionadas para a biblioteca"
 
-#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:21
+#: 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
@@ -5745,14 +5758,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:766
+#: src/Resources.vala:739
 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:771
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
@@ -5760,7 +5773,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:776
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -5768,7 +5781,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:781
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
@@ -5776,7 +5789,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:786
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %d de %b de %Y"
@@ -5963,7 +5976,7 @@ msgid "Photo state"
 msgstr "Estado da foto"
 
 #: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1115
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Avaliação"
 
@@ -5991,7 +6004,7 @@ msgstr "★★★★+ Avaliação"
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Avaliação"
 
-#: src/SearchFilter.vala:1065
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Erro ao carregar barra de pesquisa de UI: %s"
@@ -6001,24 +6014,24 @@ msgstr "Erro ao carregar barra de pesquisa de UI: %s"
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1074
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Fechar"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1080
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Tipo"
 
-#: src/SearchFilter.vala:1087
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/SearchFilter.vala:1090
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "Fotos RAW"
 
-#: src/SearchFilter.vala:1126
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr "Use uma pesquisa salva para filtrar itens na visão atual"
 
@@ -6117,10 +6130,6 @@ msgstr "Abrir com editor e_xterno"
 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
@@ -6305,204 +6314,188 @@ msgstr "_Fotos"
 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
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Definir como plano de fundo da área de trabalho"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Usar para área de trabalho"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Usar para tela de bloqueio"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Definir apresentação de slides da área de trabalho"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Gerar apresentação de slides no plano de fundo da área de trabalho"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Exibe cada foto para"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "período de tempo"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Gerar apresentação de slides no plano de fundo da área de trabalho"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "O tempo que cada foto é exibida como plano de fundo da área de trabalho"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Nome da pesquisa:"
-
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "Co_mbinação"
-
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "do seguinte:"
-
-#: ui/shotwell.ui:195
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Tamanho da imagem impressa</b>"
-
-#: ui/shotwell.ui:212
-msgid "Use a _standard size:"
-msgstr "Usar um taman_ho padrão:"
-
-#: ui/shotwell.ui:255
-msgid "Use a c_ustom size:"
-msgstr "Usar um tamanho _personalizado:"
-
-#: ui/shotwell.ui:345
-msgid "_Match photo aspect ratio"
-msgstr "_Correspondência de proporção de aspecto da foto"
-
-#: ui/shotwell.ui:369
-msgid "_Autosize:"
-msgstr "Tamanho _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 _título da imagem"
-
-#: ui/shotwell.ui:470
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Resolução em pixel</b>"
-
-#: ui/shotwell.ui:490
-msgid "_Output photo at:"
-msgstr "_Saída da foto em:"
-
-#: ui/shotwell.ui:525
-msgid "pixels per inch"
-msgstr "pixels por polegada"
-
-#: ui/shotwell.ui:559
-msgid "label"
-msgstr "rótulo"
-
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Preferências do Shotwell"
-
-#: ui/shotwell.ui:730
+#: ui/shotwell.ui:65
 msgid "white"
 msgstr "branco"
 
-#: ui/shotwell.ui:757
+#: ui/shotwell.ui:92
 msgid "black"
 msgstr "preto"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Monitorar diretório da biblioteca por novos arquivos"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Metadados"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Gravar etiquetas, títulos e outros _metadados para arquivos de fotos"
-
-#: ui/shotwell.ui:880
+#: ui/shotwell.ui:123
 msgid "Display"
 msgstr "Exibição"
 
-#: ui/shotwell.ui:901
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "_Plano de fundo:"
+
+#: ui/shotwell.ui:175
 msgid "_Import photos to:"
 msgstr "_Importar fotos para:"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Plano de fundo:"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Monitorar diretório da biblioteca por novos arquivos"
 
-#: ui/shotwell.ui:947
+#: ui/shotwell.ui:209
 msgid "Importing"
 msgstr "Importando"
 
-#: ui/shotwell.ui:970
+#: ui/shotwell.ui:226
 msgid "_Directory structure:"
 msgstr "Estrutura de _diretório:"
 
-#: ui/shotwell.ui:1012
-msgid "_Pattern:"
-msgstr "_Padrão:"
-
-#: ui/shotwell.ui:1094
+#: ui/shotwell.ui:240
 msgid "Example:"
 msgstr "Exemplo:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:249
 msgid "R_ename imported files to lowercase"
 msgstr "R_enomear arquivos importados para letra minúscula"
 
-#: ui/shotwell.ui:1140
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Metadados"
+
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Gravar etiquetas, títulos e outros _metadados para arquivos de fotos"
+
+#: ui/shotwell.ui:306
 msgid "RAW Developer"
 msgstr "Desenvolvedor RAW"
 
-#: ui/shotwell.ui:1175
+#: ui/shotwell.ui:323
 msgid "De_fault:"
 msgstr "Pa_drão:"
 
-#: ui/shotwell.ui:1229
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Padrão:"
+
+#: ui/shotwell.ui:439
 msgid "E_xternal photo editor:"
 msgstr "Editor de foto e_xterno:"
 
-#: ui/shotwell.ui:1245
+#: ui/shotwell.ui:456
 msgid "External _RAW editor:"
 msgstr "Editor _RAW externo:"
 
-#: ui/shotwell.ui:1310
+#: ui/shotwell.ui:517
 msgid "External Editors"
 msgstr "Editores externos"
 
-#: ui/shotwell.ui:1337
+#: ui/shotwell.ui:542
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ui/shotwell.ui:1403
+#: ui/shotwell.ui:583
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Tamanho da imagem impressa</b>"
+
+#: ui/shotwell.ui:600
+msgid "Use a _standard size:"
+msgstr "Usar um taman_ho padrão:"
+
+#: ui/shotwell.ui:643
+msgid "Use a c_ustom size:"
+msgstr "Usar um tamanho _personalizado:"
+
+#: ui/shotwell.ui:731
+msgid "_Match photo aspect ratio"
+msgstr "_Correspondência de proporção de aspecto da foto"
+
+#: ui/shotwell.ui:755
+msgid "_Autosize:"
+msgstr "Tamanho _automático:"
+
+#: ui/shotwell.ui:795
+msgid "<b>Titles</b>"
+msgstr "<b>Títulos</b>"
+
+#: ui/shotwell.ui:812
+msgid "Print image _title"
+msgstr "Imprimir _título da imagem"
+
+#: ui/shotwell.ui:855
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Resolução em pixel</b>"
+
+#: ui/shotwell.ui:875
+msgid "_Output photo at:"
+msgstr "_Saída da foto em:"
+
+#: ui/shotwell.ui:909
+msgid "pixels per inch"
+msgstr "pixels por polegada"
+
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "_Nome da pesquisa:"
+
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "Co_mbinação"
+
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "do seguinte:"
+
+#: ui/shotwell.ui:1111
+msgid "label"
+msgstr "rótulo"
+
+#: ui/shotwell.ui:1262
 msgid "_Delay:"
 msgstr "A_traso:"
 
-#: ui/shotwell.ui:1419
+#: ui/shotwell.ui:1276
 msgid "_Transition effect:"
 msgstr "Efeito de _transição:"
 
-#: ui/shotwell.ui:1435
+#: ui/shotwell.ui:1290
 msgid "Transition d_elay:"
 msgstr "A_traso de transição:"
 
-#: ui/shotwell.ui:1447
+#: ui/shotwell.ui:1300
 msgid "Show t_itle"
 msgstr "Mostrar títul_o"
 
-#: ui/shotwell.ui:1537 ui/shotwell.ui:1550
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
 msgid "seconds"
 msgstr "segundos"
 
@@ -6514,6 +6507,15 @@ msgstr "Nova etique_ta…"
 msgid "Delete all photos in the trash"
 msgstr "Apaga todas as fotos na lixeira"
 
+#~ msgid "DirectContextMenu"
+#~ msgstr "DirectContextMenu"
+
+#~ msgid "SearchContextMenu"
+#~ msgstr "SearchContextMenu"
+
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Preferências do Shotwell"
+
 #~ 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, "
@@ -7185,9 +7187,6 @@ msgstr "Apaga todas as fotos na lixeira"
 #~ 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…"
 
diff --git a/po/shotwell.pot b/po/shotwell.pot
index f004876..d1383ee 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.25.2\n"
+"Project-Id-Version: shotwell 0.25.3\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2016-12-12 18:23+0100\n"
+"POT-Creation-Date: 2017-01-16 20:40+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,9 +21,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:348
-#: ui/event.ui:492 ui/media.ui:341 ui/photo_context.ui:91 ui/photo.ui:331
-#: ui/tags.ui:341
+#: 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 ""
 
@@ -1356,94 +1356,92 @@ msgstr ""
 msgid "Core Data Import Services"
 msgstr ""
 
-#: 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:1464
-msgid "_Log in"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
-msgid "API _Key:"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
-msgid "or"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
 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:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: 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
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
 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:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: 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"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
-msgid "A _new album"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr ""
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+msgid "_Publish"
+msgstr ""
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr ""
@@ -1517,49 +1515,49 @@ msgstr ""
 msgid " Site Not Found"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: 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/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: 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/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr ""
@@ -1599,11 +1597,11 @@ msgstr ""
 msgid "Shotwell Extra Publishing Services"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr ""
@@ -1613,13 +1611,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1205
 #: 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/FlickrPublishing.vala:1206
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr ""
@@ -1692,42 +1690,42 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr ""
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -1792,17 +1790,17 @@ msgid "Where would you like to publish the selected photos?"
 msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -1812,7 +1810,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr ""
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr ""
 
@@ -1835,78 +1833,74 @@ msgstr ""
 msgid "Preparing for login…"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
 msgid "Verifying authorization…"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, 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] ""
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr ""
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr ""
 
@@ -2320,10 +2314,10 @@ msgstr ""
 msgid "Cameras"
 msgstr ""
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
-#: ui/collection.ui:90 ui/event.ui:353 ui/event.ui:497 ui/media.ui:346
-#: ui/photo_context.ui:96 ui/photo.ui:336 ui/tags.ui:346
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 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 ""
 
@@ -2331,138 +2325,146 @@ msgstr ""
 msgid "RAW+JPEG"
 msgstr ""
 
-#: src/camera/ImportPage.vala:458
+#: src/camera/ImportPage.vala:466
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr ""
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr ""
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr ""
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr ""
+
+#: src/camera/ImportPage.vala:857
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:861
 msgid "No new photos/videos found on camera"
 msgstr ""
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:999
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1005
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1037
 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:1025
+#: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1030
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
 "%s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1717
+#: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1720
+#: src/camera/ImportPage.vala:1742
 #, 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:1723
+#: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1776
 #, 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:74 src/direct/DirectPhotoPage.vala:78
-#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2460 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:533 ui/photo.ui:28
+#: 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
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2470 src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr ""
 
@@ -2474,47 +2476,47 @@ msgstr ""
 msgid "Fullscreen"
 msgstr ""
 
-#: src/CollectionPage.vala:96 ui/photo.ui:167
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr ""
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:104
-#: ui/photo.ui:187
+#: 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:109
-#: ui/photo.ui:192
+#: 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:114
-#: ui/photo.ui:197
+#: 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:118
-#: ui/photo.ui:201
+#: 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:127 ui/event.ui:415
-#: ui/photo_context.ui:6 ui/photo.ui:210
+#: 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:154 ui/event.ui:420
-#: ui/photo_context.ui:11 ui/photo.ui:237
+#: 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:243
+#: 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:248
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr ""
 
@@ -2527,7 +2529,7 @@ msgid "Open With E_xternal Editor"
 msgstr ""
 
 #: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
-#: ui/event.ui:518 ui/photo_context.ui:118 ui/photo.ui:350
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
 msgid "Open With RA_W Editor"
 msgstr ""
 
@@ -2535,43 +2537,43 @@ msgstr ""
 msgid "_Play"
 msgstr ""
 
-#: src/CollectionPage.vala:402
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr ""
 
-#: src/CollectionPage.vala:402
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr ""
 
-#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
 msgid "Export Photo"
 msgstr ""
 
-#: src/CollectionPage.vala:404 src/Dialogs.vala:84
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr ""
 
-#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr ""
 
-#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr ""
 
-#: src/CollectionPage.vala:516
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:517
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:526
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr ""
 
-#: src/CollectionPage.vala:527
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr ""
 
@@ -2778,7 +2780,7 @@ msgstr ""
 msgid "Database file:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:769
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr ""
 
@@ -2853,8 +2855,8 @@ msgstr[1] ""
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
-#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/trash.ui:56 ui/trash.ui:179
-#: ui/trash.ui:221
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr ""
 
@@ -3575,11 +3577,11 @@ msgstr ""
 msgid "Import to Library"
 msgstr ""
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
 msgid "Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
 msgid "Removing Photo From Library"
 msgstr ""
 
@@ -3657,51 +3659,51 @@ msgstr ""
 msgid "Height"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:92
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:94
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:96
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
 "%s."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:113
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:297
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:300
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:301
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:334
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
 msgid "Save As"
 msgstr ""
 
@@ -3914,7 +3916,7 @@ msgid "Angle:"
 msgstr ""
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
-#: ui/direct.ui:137 ui/photo.ui:220
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr ""
 
@@ -3943,31 +3945,31 @@ msgid_plural "%d Photos"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/events/EventPage.vala:121
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:143
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:147
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:220
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:234
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:235
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:236
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr ""
 
@@ -4015,12 +4017,12 @@ msgstr ""
 msgid "Library"
 msgstr ""
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr ""
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
-#: src/SearchFilter.vala:1104
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr ""
 
@@ -4028,11 +4030,11 @@ msgstr ""
 msgid "Importing…"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:122
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:149
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr ""
@@ -4041,19 +4043,19 @@ msgstr ""
 msgid "Last Import"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:251
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:766
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4062,33 +4064,33 @@ msgid ""
 "Do you want to continue importing photos?"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:769 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr ""
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:782
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1062
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1106 src/library/LibraryWindow.vala:1117
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1128
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1136
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
 msgstr ""
 
@@ -4096,7 +4098,7 @@ msgstr ""
 msgid "Missing Files"
 msgstr ""
 
-#: src/library/OfflinePage.vala:103
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr ""
 
@@ -4104,15 +4106,15 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: src/library/TrashPage.vala:101
+#: src/library/TrashPage.vala:108
 msgid "Trash is empty"
 msgstr ""
 
-#: src/library/TrashPage.vala:105
+#: src/library/TrashPage.vala:112
 msgid "Delete"
 msgstr ""
 
-#: src/library/TrashPage.vala:106
+#: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
 msgstr ""
 
@@ -4189,22 +4191,22 @@ msgstr ""
 msgid "Adjust the size of the thumbnails"
 msgstr ""
 
-#: src/MediaPage.vala:493
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
 msgstr ""
 
-#: src/Page.vala:1300
+#: src/Page.vala:1312
 msgid "No photos/videos"
 msgstr ""
 
-#: src/Page.vala:1304
+#: src/Page.vala:1316
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2610
+#: src/Page.vala:2622
 msgid "Photos cannot be exported to this directory."
 msgstr ""
 
@@ -4223,7 +4225,7 @@ msgstr ""
 msgid "Photo source file missing: %s"
 msgstr ""
 
-#: src/PhotoPage.vala:2997
+#: src/PhotoPage.vala:3014
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr ""
@@ -4560,7 +4562,9 @@ msgstr ""
 msgid "Flip Vertically"
 msgstr ""
 
-#: src/Resources.vala:155 ui/appmenu.ui:27 ui/appmenu.ui:55
+#: 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 ""
 
@@ -4568,9 +4572,9 @@ msgstr ""
 msgid "_Apply"
 msgstr ""
 
-#: src/Resources.vala:159 ui/direct.ui:37 ui/events_directory.ui:25
-#: ui/event.ui:47 ui/import.ui:33 ui/media.ui:40 ui/offline.ui:25
-#: ui/photo.ui:48 ui/tags.ui:40 ui/top.ui:10 ui/trash.ui:30
+#: 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 ""
 
@@ -4578,13 +4582,17 @@ msgstr ""
 msgid "_Forward"
 msgstr ""
 
-#: src/Resources.vala:161 ui/direct.ui:55 ui/events_directory.ui:112
-#: ui/photo.ui:160
+#: 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/appmenu.ui:14 ui/appmenu.ui:42
-#: ui/import_queue.ui:58 ui/import_queue.ui:61 ui/top.ui:40
+#: 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 ""
 
@@ -4592,7 +4600,7 @@ msgstr ""
 msgid "Leave _Fullscreen"
 msgstr ""
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr ""
 
@@ -4600,7 +4608,9 @@ msgstr ""
 msgid "_Next"
 msgstr ""
 
-#: src/Resources.vala:168 src/Resources.vala:317 ui/appmenu.ui:8
+#: 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 ""
 
@@ -4608,7 +4618,9 @@ msgstr ""
 msgid "_Previous"
 msgstr ""
 
-#: src/Resources.vala:171 ui/appmenu.ui:33 ui/appmenu.ui:61 ui/event.ui:40
+#: 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 ""
 
@@ -4648,13 +4660,13 @@ msgstr ""
 msgid "Best _Fit"
 msgstr ""
 
-#: src/Resources.vala:183 ui/direct.ui:62 ui/event.ui:254 ui/media.ui:247
-#: ui/photo.ui:131 ui/tags.ui:247
+#: 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:184 ui/direct.ui:67 ui/event.ui:259 ui/media.ui:252
-#: ui/photo.ui:136 ui/tags.ui:252
+#: 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 ""
 
@@ -4682,7 +4694,7 @@ msgstr ""
 msgid "Apply copied color adjustments to the selected photos"
 msgstr ""
 
-#: src/Resources.vala:198 ui/direct.ui:132 ui/photo.ui:215
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr ""
 
@@ -4702,7 +4714,7 @@ msgstr ""
 msgid "Straighten the photo"
 msgstr ""
 
-#: src/Resources.vala:206 ui/direct.ui:142 ui/photo.ui:225
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr ""
 
@@ -4714,7 +4726,7 @@ msgstr ""
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr ""
 
-#: src/Resources.vala:210 ui/direct.ui:147 ui/photo.ui:230
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr ""
 
@@ -4746,9 +4758,9 @@ msgstr ""
 msgid "Set as _Desktop Slideshow…"
 msgstr ""
 
-#: src/Resources.vala:224 ui/direct.ui:40 ui/events_directory.ui:28
-#: ui/event.ui:50 ui/import.ui:36 ui/media.ui:43 ui/offline.ui:28
-#: ui/photo.ui:51 ui/tags.ui:43 ui/trash.ui:33
+#: 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 ""
 
@@ -4756,9 +4768,9 @@ msgstr ""
 msgid "Undo"
 msgstr ""
 
-#: src/Resources.vala:227 ui/direct.ui:45 ui/events_directory.ui:33
-#: ui/event.ui:55 ui/import.ui:41 ui/media.ui:48 ui/offline.ui:33
-#: ui/photo.ui:56 ui/tags.ui:48 ui/trash.ui:38
+#: 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 ""
 
@@ -4766,12 +4778,12 @@ msgstr ""
 msgid "Redo"
 msgstr ""
 
-#: src/Resources.vala:230 ui/events_directory.ui:126 ui/events_directory.ui:144
-#: ui/event.ui:385 ui/event.ui:554
+#: 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 ui/event.ui:365 ui/event.ui:546
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr ""
 
@@ -4779,7 +4791,7 @@ msgstr ""
 msgid "Make Key Photo for Event"
 msgstr ""
 
-#: src/Resources.vala:236 ui/event.ui:374 ui/media.ui:361 ui/tags.ui:361
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr ""
 
@@ -4795,7 +4807,7 @@ msgstr ""
 msgid "Move photos to an event"
 msgstr ""
 
-#: src/Resources.vala:242 ui/events_directory.ui:122 ui/events_directory.ui:140
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr ""
 
@@ -4807,8 +4819,8 @@ msgstr ""
 msgid "Combine events into a single event"
 msgstr ""
 
-#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:280 ui/event.ui:446
-#: ui/media.ui:273 ui/photo_context.ui:35 ui/photo.ui:260 ui/tags.ui:273
+#: 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 ""
 
@@ -4820,8 +4832,8 @@ msgstr ""
 msgid "Change the rating of your photo"
 msgstr ""
 
-#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:320 ui/event.ui:479
-#: ui/media.ui:313 ui/photo_context.ui:75 ui/photo.ui:300 ui/tags.ui:313
+#: 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 ""
 
@@ -4829,8 +4841,8 @@ msgstr ""
 msgid "Increase Rating"
 msgstr ""
 
-#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:325 ui/event.ui:483
-#: ui/media.ui:318 ui/photo_context.ui:80 ui/photo.ui:305 ui/tags.ui:318
+#: 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 ""
 
@@ -4838,8 +4850,8 @@ msgstr ""
 msgid "Decrease Rating"
 msgstr ""
 
-#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:308 ui/event.ui:469
-#: ui/media.ui:301 ui/photo_context.ui:63 ui/photo.ui:288 ui/tags.ui:301
+#: 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 ""
 
@@ -4859,8 +4871,8 @@ msgstr ""
 msgid "Remove any ratings"
 msgstr ""
 
-#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:313 ui/event.ui:473
-#: ui/media.ui:306 ui/photo_context.ui:68 ui/photo.ui:293 ui/tags.ui:306
+#: 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 ""
 
@@ -4880,8 +4892,8 @@ msgstr ""
 msgid "Set rating to rejected"
 msgstr ""
 
-#: src/Resources.vala:268 ui/event.ui:190 ui/import.ui:143 ui/media.ui:183
-#: ui/offline.ui:140 ui/search_bar.ui:6 ui/tags.ui:183 ui/trash.ui:149
+#: 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 ""
 
@@ -4893,8 +4905,8 @@ msgstr ""
 msgid "Show only rejected photos"
 msgstr ""
 
-#: src/Resources.vala:272 ui/event.ui:184 ui/import.ui:137 ui/media.ui:177
-#: ui/offline.ui:134 ui/search_bar.ui:12 ui/tags.ui:177 ui/trash.ui:143
+#: 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 ""
 
@@ -4903,8 +4915,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr ""
 
-#: src/Resources.vala:275 ui/event.ui:178 ui/import.ui:131 ui/media.ui:171
-#: ui/offline.ui:128 ui/search_bar.ui:18 ui/tags.ui:171 ui/trash.ui:137
+#: 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 ""
 
@@ -4913,8 +4925,8 @@ msgstr ""
 msgid "Show all photos"
 msgstr ""
 
-#: src/Resources.vala:279 ui/event.ui:138 ui/media.ui:131 ui/photo.ui:107
-#: ui/tags.ui:131
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr ""
 
@@ -4922,8 +4934,8 @@ msgstr ""
 msgid "Display each photo’s rating"
 msgstr ""
 
-#: src/Resources.vala:282 ui/event.ui:145 ui/import.ui:98 ui/media.ui:138
-#: ui/offline.ui:95 ui/tags.ui:138 ui/trash.ui:104
+#: 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 ""
 
@@ -4959,8 +4971,8 @@ msgstr ""
 msgid "Publish to various websites"
 msgstr ""
 
-#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:334 ui/event.ui:505
-#: ui/media.ui:327 ui/photo_context.ui:105 ui/photo.ui:314 ui/tags.ui:327
+#: 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 ""
 
@@ -4970,9 +4982,9 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr ""
 
-#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:131
-#: ui/events_directory.ui:149 ui/event.ui:338 ui/event.ui:390 ui/event.ui:509
-#: ui/media.ui:331 ui/photo_context.ui:109 ui/photo.ui:318 ui/tags.ui:331
+#: 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 ""
 
@@ -4981,11 +4993,11 @@ msgstr ""
 msgid "Edit Comment"
 msgstr ""
 
-#: src/Resources.vala:306 ui/event.ui:558
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr ""
 
-#: src/Resources.vala:309 ui/direct.ui:160 ui/photo.ui:322
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
 msgstr ""
 
@@ -4993,8 +5005,8 @@ msgstr ""
 msgid "Adjust Date and Time"
 msgstr ""
 
-#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:399 ui/event.ui:426
-#: ui/media.ui:375 ui/photo.ui:359 ui/tags.ui:375
+#: 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 ""
 
@@ -5016,13 +5028,13 @@ msgstr ""
 msgid "_Find…"
 msgstr ""
 
-#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:202
-#: ui/trash.ui:275
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr ""
 
-#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:199
-#: ui/trash.ui:272
+#: 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 ""
 
@@ -5080,12 +5092,12 @@ msgstr ""
 msgid "Rename Tag “%s” to “%s”"
 msgstr ""
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr ""
 
-#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:404 ui/event.ui:431
-#: ui/media.ui:380 ui/photo_context.ui:22 ui/photo.ui:364 ui/tags.ui:380
+#: 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 ""
 
@@ -5132,7 +5144,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1125
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr ""
 
@@ -5198,26 +5210,26 @@ msgstr ""
 msgid "Only show photos with a rating of %s or better"
 msgstr ""
 
-#: src/Resources.vala:659 ui/trash.ui:218
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr ""
 
-#: src/Resources.vala:660 ui/offline.ui:184
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr ""
 
-#: src/Resources.vala:662 ui/trash.ui:61 ui/trash.ui:184 ui/trash.ui:236
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr ""
 
-#: src/Resources.vala:663 ui/trash.ui:233
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr ""
 
 #: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
-#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:528 ui/media.ui:27
+#: 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:190
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr ""
 
@@ -5230,17 +5242,17 @@ msgstr ""
 msgid "Unable to open in file manager: %s"
 msgstr ""
 
-#: src/Resources.vala:672 ui/offline.ui:187
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr ""
 
-#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:539
-#: ui/media.ui:72 ui/photo_context.ui:139 ui/photo.ui:75 ui/tags.ui:72
+#: 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:676 ui/events_directory.ui:51 ui/event.ui:86
-#: ui/import.ui:54 ui/media.ui:79 ui/offline.ui:58 ui/tags.ui:79 ui/trash.ui:67
+#: 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 ""
 
@@ -5475,7 +5487,7 @@ msgid "Photo state"
 msgstr ""
 
 #: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1115
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr ""
 
@@ -5503,7 +5515,7 @@ msgstr ""
 msgid "★★★★★+ Rating"
 msgstr ""
 
-#: src/SearchFilter.vala:1065
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr ""
@@ -5513,24 +5525,24 @@ 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:1074
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr ""
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1080
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr ""
 
-#: src/SearchFilter.vala:1087
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr ""
 
-#: src/SearchFilter.vala:1090
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr ""
 
-#: src/SearchFilter.vala:1126
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
@@ -5610,30 +5622,22 @@ msgstr ""
 msgid "Export Videos"
 msgstr ""
 
-#: ui/appmenu.ui:19 ui/appmenu.ui:47 ui/import_queue.ui:66
-msgid "_Frequently Asked Questions"
-msgstr ""
-
-#: ui/appmenu.ui:23 ui/appmenu.ui:51 ui/import_queue.ui:70
-msgid "_Report a Problem…"
-msgstr ""
-
-#: ui/collection.ui:33 ui/event.ui:275 ui/event.ui:440 ui/media.ui:268
-#: ui/photo_context.ui:30 ui/photo.ui:255 ui/tags.ui:268
+#: 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:345 ui/event.ui:489 ui/media.ui:338
-#: ui/photo_context.ui:88 ui/photo.ui:328 ui/tags.ui:338
+#: 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:513 ui/photo_context.ui:113 ui/photo.ui:345
+#: 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:379 ui/event.ui:524 ui/media.ui:366
-#: ui/photo_context.ui:124 ui/tags.ui:366
+#: 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 ""
 
@@ -5647,40 +5651,52 @@ msgstr ""
 msgid "Save _As…"
 msgstr ""
 
-#: ui/direct.ui:52 ui/events_directory.ui:58 ui/event.ui:93
-#: ui/import_queue.ui:31 ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65
-#: ui/photo.ui:82 ui/tags.ui:86 ui/top.ui:15 ui/trash.ui:74
+#: 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:74 ui/photo.ui:143
+#: ui/direct.ui:81 ui/photo.ui:156
 msgid "Fit to _Page"
 msgstr ""
 
-#: ui/direct.ui:79 ui/photo.ui:148
+#: ui/direct.ui:86 ui/photo.ui:161
 msgid "Zoom _100%"
 msgstr ""
 
-#: ui/direct.ui:84 ui/photo.ui:153
+#: ui/direct.ui:91 ui/photo.ui:166
 msgid "Zoom _200%"
 msgstr ""
 
-#: ui/direct.ui:91 ui/photo.ui:174 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
 msgid "_Photo"
 msgstr ""
 
-#: ui/direct.ui:94 ui/photo.ui:177
+#: ui/direct.ui:101 ui/photo.ui:190
 msgid "_Previous Photo"
 msgstr ""
 
-#: ui/direct.ui:98 ui/photo.ui:181
+#: ui/direct.ui:105 ui/photo.ui:194
 msgid "_Next Photo"
 msgstr ""
 
-#: ui/direct.ui:124 ui/photo.ui:207
+#: 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…"
@@ -5694,114 +5710,114 @@ 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:197 ui/trash.ui:205
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
 msgid "Empty T_rash"
 msgstr ""
 
-#: ui/events_directory.ui:40 ui/event.ui:62 ui/import.ui:48 ui/media.ui:55
-#: ui/offline.ui:40 ui/tags.ui:55 ui/trash.ui:45
+#: 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:44 ui/event.ui:66 ui/media.ui:59 ui/offline.ui:44
-#: ui/photo.ui:63 ui/search_sidebar_context.ui:6
-#: ui/sidebar_default_context.ui:6 ui/tags.ui:59 ui/trash.ui:49
+#: 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:61 ui/event.ui:96 ui/import_queue.ui:34
-#: ui/import.ui:64 ui/media.ui:89 ui/offline.ui:68 ui/photo.ui:85 ui/tags.ui:89
-#: ui/trash.ui:77
+#: 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:66 ui/event.ui:101 ui/import.ui:69 ui/media.ui:94
-#: ui/offline.ui:73 ui/photo.ui:90 ui/tags.ui:94 ui/trash.ui:82
+#: 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:71 ui/event.ui:106 ui/import.ui:74 ui/media.ui:99
-#: ui/offline.ui:78 ui/tags.ui:99 ui/trash.ui:87
+#: 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:76 ui/event.ui:111 ui/import.ui:79 ui/media.ui:104
-#: ui/offline.ui:83 ui/photo.ui:95 ui/tags.ui:104 ui/trash.ui:92
+#: 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:81 ui/event.ui:116 ui/import.ui:84 ui/media.ui:109
-#: ui/offline.ui:88 ui/photo.ui:100 ui/tags.ui:109 ui/trash.ui:97
+#: 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:88 ui/event.ui:128 ui/media.ui:121 ui/tags.ui:121
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
 msgid "_Comments"
 msgstr ""
 
-#: ui/events_directory.ui:95 ui/event.ui:237 ui/import_queue.ui:41
-#: ui/import.ui:153 ui/media.ui:230 ui/offline.ui:150 ui/photo.ui:114
-#: ui/tags.ui:230 ui/trash.ui:159
+#: 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:98 ui/event.ui:225 ui/event.ui:240
-#: ui/import_queue.ui:44 ui/import.ui:156 ui/media.ui:218 ui/media.ui:233
-#: ui/offline.ui:153 ui/photo.ui:117 ui/tags.ui:218 ui/tags.ui:233
-#: ui/trash.ui:162
+#: 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:103 ui/event.ui:230 ui/import_queue.ui:49
-#: ui/media.ui:223 ui/offline.ui:158 ui/tags.ui:223 ui/trash.ui:167
+#: 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:119 ui/event.ui:371 ui/media.ui:358 ui/tags.ui:358
+#: 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:67 ui/offline.ui:51 ui/offline.ui:170
-#: ui/photo.ui:70 ui/tags.ui:67
+#: 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:123 ui/import.ui:91 ui/media.ui:116 ui/tags.ui:116
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr ""
 
-#: ui/event.ui:133 ui/event.ui:396 ui/media.ui:126 ui/media.ui:372
-#: ui/photo.ui:356 ui/tags.ui:126 ui/tags.ui:372 ui/top.ui:35
+#: 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:200 ui/media.ui:193 ui/tags.ui:193
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
 msgid "Sort _Photos"
 msgstr ""
 
-#: ui/event.ui:203 ui/media.ui:196 ui/tags.ui:196
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
 msgid "By _Title"
 msgstr ""
 
-#: ui/event.ui:208 ui/media.ui:201 ui/tags.ui:201
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
 msgid "By _Filename"
 msgstr ""
 
-#: ui/event.ui:213 ui/media.ui:206 ui/tags.ui:206
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
 msgid "By Exposure _Date"
 msgstr ""
 
-#: ui/event.ui:218 ui/media.ui:211 ui/tags.ui:211
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
 msgid "By _Rating"
 msgstr ""
 
-#: ui/event.ui:245 ui/import.ui:161 ui/media.ui:238 ui/photo.ui:122
-#: ui/tags.ui:238
+#: 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:269 ui/media.ui:262 ui/tags.ui:262 ui/top.ui:25
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
 msgid "_Photos"
 msgstr ""
 
@@ -5809,14 +5825,6 @@ msgstr ""
 msgid "_Stop Import"
 msgstr ""
 
-#: ui/import.ui:13 ui/import.ui:173
-msgid "Import _Selected"
-msgstr ""
-
-#: ui/import.ui:17 ui/import.ui:177
-msgid "Import _All"
-msgstr ""
-
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr ""
@@ -6005,6 +6013,6 @@ msgstr ""
 msgid "New _Tag…"
 msgstr ""
 
-#: ui/trash.ui:248
+#: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
index 777539e..25dab1d 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index c84aa46..2f8fd6a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -19,8 +19,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-01 03:04+0000\n"
-"PO-Revision-Date: 2016-08-10 14:39+0200\n"
+"POT-Creation-Date: 2017-01-01 19:37+0000\n"
+"PO-Revision-Date: 2017-01-01 21:01+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -28,11 +28,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.8\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
-#: 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"
 
@@ -46,7 +48,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 ""
 
@@ -84,7 +86,6 @@ 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"
 
@@ -121,7 +122,7 @@ msgid "The secret token to sign oauth requests"
 msgstr ""
 
 #: 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 "predvolená veľkosť"
 
@@ -147,9 +148,9 @@ msgid "URL of the Rajce server."
 msgstr "URL servera služby 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 "používateľské meno"
 
@@ -166,7 +167,7 @@ msgid "user token, if remembered."
 msgstr "Token používateľa, ak je zapamätaný."
 
 #: 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 "posledná kategória"
 
@@ -175,9 +176,9 @@ msgid "The last selected Rajce category."
 msgstr "Posledná vybraná kategória služby Rajce."
 
 #: 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 "veľkosť poslednej fotky"
+msgstr "veľkosť poslednej fotografie"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:65
 msgid ""
@@ -211,11 +212,11 @@ msgid ""
 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
+#: 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 ""
 
@@ -225,1008 +226,1055 @@ msgid ""
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr "zobraziť základné vlastnosti"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:28
+#: misc/org.yorba.shotwell.gschema.xml:29
 msgid "display extended properties"
 msgstr "zobraziť rozšírené vlastnosti"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:34
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "zobraziť bočný panel"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:40
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "zobraziť panel nástrojov"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "zobraziť panel vyhľadávania"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:52
+#: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
 msgstr "zobraziť názvy fotografií"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
 msgstr "zobraziť komentáre k fotografiám"
 
-#: 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."
 msgstr ""
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
-#: misc/org.yorba.shotwell.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "zobraziť komentáre k udalostiam"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:70
+#: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
 msgstr "zobraziť značky fotografií"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:76
+#: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
 msgstr "zobraziť hodnotenia fotografií"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:82
+#: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
 msgstr ""
 
-#: 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 "
 "or better, 6: Four or better, 7: Five or better."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "usporiadať udalosti vzostupne"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:94
+#: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
 msgstr "usporiadať fotografie knižnice vzostupne"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:100
+#: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:106
+#: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
 msgstr "usporiadať fotografie udalostí vzostupne"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:112
+#: misc/org.yorba.shotwell.gschema.xml:113
 #, fuzzy
 #| msgid "Sort photos by title"
 msgid "sort event photos criteria"
 msgstr "Usporiadať fotografie podľa názvu"
 
-#: misc/org.yorba.shotwell.gschema.xml:113
+#: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:118
+#: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:124
+#: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:130
+#: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
 msgstr "upraviť pôvodné súbory fotiek"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:136
+#: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:142
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "pozícia bočného panela"
 
-#: misc/org.yorba.shotwell.gschema.xml:143
+#: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:148
+#: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:154
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "pripnúť stav panela nástrojov"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr "Určí, či bude panel nástrojov pripnutý v režime celej obrazovky."
 
-#: misc/org.yorba.shotwell.gschema.xml:160
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
 msgstr "farba pozadia"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:174
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "oneskorenie"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:176
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:180
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "oneskorenie prechodu"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:186
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "identifikátor efektu prechodu"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:192
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "Zobraziť názov"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:200
+#: misc/org.yorba.shotwell.gschema.xml:201
 msgid "maximize library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:202
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:206
+#: misc/org.yorba.shotwell.gschema.xml:207
 msgid "width of library window"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:212
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "height of library window"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:218
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "maximize direct-edit window"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:224
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "width of direct-edit window"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:230
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "height of direct-edit window"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:236
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "sidebar divider position"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:244
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "adresár importu"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:250
+#: misc/org.yorba.shotwell.gschema.xml:251
 msgid "watch library directory for new files"
 msgstr "sledovať nové súbory v adresári knižnice"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:256
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "write metadata to master files"
 msgstr "zapísať metaúdaje do hlavných súborov"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:262
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "use lowercase filenames"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:268
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "vzor adresárov"
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:274
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "directory pattern custom"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:280
+#: misc/org.yorba.shotwell.gschema.xml:281
 #, fuzzy
 #| msgid "RAW Developer"
 msgid "RAW developer default"
 msgstr "RAW vývojka"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:288
+#: misc/org.yorba.shotwell.gschema.xml:289
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:306
+#: misc/org.yorba.shotwell.gschema.xml:307
 #, fuzzy
 #| msgid "E_xternal photo editor:"
 msgid "external photo editor"
 msgstr "_Externý editor fotografií:"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:312
+#: misc/org.yorba.shotwell.gschema.xml:313
 #, fuzzy
 #| msgid "External _RAW editor:"
 msgid "external raw editor"
 msgstr "Externý _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 ""
 
-#: 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 ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#, fuzzy
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "Exportovať metaúdaje"
+
+#: 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 ""
+
+#: 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 "Hlavné uverejňovacie služby"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:326
+#: misc/org.yorba.shotwell.gschema.xml:396
 #, fuzzy
 #| msgid "Core Publishing Services"
 msgid "default publishing service"
 msgstr "Hlavné uverejňovacie služby"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
+#: misc/org.yorba.shotwell.gschema.xml:410
 #, fuzzy
 #| msgid "Access _type:"
 msgid "access token"
 msgstr "_Typ prístupu:"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:346
+#: misc/org.yorba.shotwell.gschema.xml:416
 msgid "user i.d."
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "používateľské meno"
 
-#: 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 ""
 "Meno aktuálne prihláseného používateľa do služby Facebook, ak nejaký existuje"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:372
+#: misc/org.yorba.shotwell.gschema.xml:442
 msgid "OAuth Access Phase Token"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:378
+#: misc/org.yorba.shotwell.gschema.xml:448
 msgid "OAuth Access Phase Token Secret"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:466
 msgid "default visibility"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:436
-msgid "Piwigio URL"
+#: misc/org.yorba.shotwell.gschema.xml:506
+msgid "Piwigo URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:437
+#: misc/org.yorba.shotwell.gschema.xml:507
 msgid "URL of the Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:513
 msgid "Piwigo username, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "heslo"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "Piwigo password, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "zapamätať heslo"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "If true, remember the Piwigo password."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "The last chosen Piwigo permission level."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:484
+#: 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 "_Ak je zadaný názov a komentár nie, použiť názov ako komentár"
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:490
+#: misc/org.yorba.shotwell.gschema.xml:560
 msgid "do not upload tags when uploading to Piwigo"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Používateľské meno služby Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "Kľúč API"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "Kľúč API služby Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:511
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "URL stránky služby 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:528
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "scaling constraint of uploaded picture"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:534
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "pixels of the major axis uploaded picture"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:550
+#: misc/org.yorba.shotwell.gschema.xml:620
 #, fuzzy
 #| msgid "Core Data Import Services"
 msgid "last used import service"
 msgstr "Služby importu údajov jadra"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:558
+#: misc/org.yorba.shotwell.gschema.xml:628
 msgid "interpreter state cookie"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:566
+#: misc/org.yorba.shotwell.gschema.xml:636
 msgid "content layout mode"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:572
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr "ppi obsahu"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:578
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content width"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:584
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "výška obsahu"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:590
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "jednotky obsahu"
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:596
+#: misc/org.yorba.shotwell.gschema.xml:666
 #, fuzzy
 #| msgid "2 images per page"
 msgid "images per page code"
 msgstr "2 obrázky na stranu"
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:602
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "size selection"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:608
+#: misc/org.yorba.shotwell.gschema.xml:678
 #, fuzzy
 #| msgid "_Match photo aspect ratio"
 msgid "match aspect ratio"
 msgstr "_Zachovať pomer strán fotografie"
 
-#: 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"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:614
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "vytlačiť názvy"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:632
+#: misc/org.yorba.shotwell.gschema.xml:702
 #, fuzzy
 #| msgid "Unable to publish"
 msgid "enable facebook publishing plugin"
 msgstr "Nepodarilo sa uverejniť"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:638
+#: misc/org.yorba.shotwell.gschema.xml:708
 msgid "enable flickr publishing plugin"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:644
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable picasa publishing plugin"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:650
+#: misc/org.yorba.shotwell.gschema.xml:720
 #, fuzzy
 #| msgid "Unable to publish"
 msgid "enable youtube publishing plugin"
 msgstr "Nepodarilo sa uverejniť"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:656
+#: misc/org.yorba.shotwell.gschema.xml:726
 #, fuzzy
 #| msgid "Unable to publish"
 msgid "enable piwigo publishing plugin"
 msgstr "Nepodarilo sa uverejniť"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:662
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable yandex publishing plugin"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:668
+#: misc/org.yorba.shotwell.gschema.xml:738
 #, fuzzy
 #| msgid "Unable to publish"
 msgid "enable tumblr publishing plugin"
 msgstr "Nepodarilo sa uverejniť"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:674
+#: misc/org.yorba.shotwell.gschema.xml:744
 #, fuzzy
 #| msgid "Gallery3 publishing module"
 msgid "enable rajce publishing plugin"
 msgstr "Modul na uverejňovanie na službe Gallery3"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:680
+#: misc/org.yorba.shotwell.gschema.xml:750
 #, fuzzy
 #| msgid "Gallery3 publishing module"
 msgid "enable gallery3 publishing plugin"
 msgstr "Modul na uverejňovanie na službe 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:686
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable F-Spot import plugin"
 msgstr ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:692
+#: misc/org.yorba.shotwell.gschema.xml:762
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow crumble transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:698
+#: misc/org.yorba.shotwell.gschema.xml:768
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow fade transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow slide transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:710
+#: misc/org.yorba.shotwell.gschema.xml:780
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow clock transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circle transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:734
+#: misc/org.yorba.shotwell.gschema.xml:804
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow squares transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:740
+#: misc/org.yorba.shotwell.gschema.xml:810
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow stripes transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:746
+#: misc/org.yorba.shotwell.gschema.xml:816
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow chess transition"
 msgstr "Hlavné prechody prezentácie"
 
-#: 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"
@@ -1236,7 +1284,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Navštíviť domovskú stránku programu Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:676
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
 msgid "translator-credits"
 msgstr ""
 "Laco Gubík <lacogubik@googlemail.com>\n"
@@ -1244,12 +1292,58 @@ msgstr ""
 "Tomáš Vadina <kyberdev@gmail.com>\n"
 "Dušan Kazik <prescott66@gmail.com>"
 
-#: plugins/common/RESTSupport.vala:448
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#. 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:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Dočasný súbor potrebný na uverejnenie nie je dostupný"
 
-#: plugins/common/RESTSupport.vala:1154
+#: plugins/common/RESTSupport.vala:1167
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1264,7 +1358,7 @@ msgstr ""
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:35
+#: 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
@@ -1358,95 +1452,94 @@ msgstr "Pripravuje sa importovanie"
 msgid "Core Data Import Services"
 msgstr "Služby importu údajov jadra"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Späť"
-
-#: 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 "_Prihlásiť sa"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL služby _Gallery3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Používateľské _meno"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Heslo"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Späť"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "_Prihlásiť"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "_Kľúč API:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "hodín"
 
-#: 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 "_Odhlásiť"
-
-#: 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 "U_verejniť"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Existujúcom albume:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "Photos will be _visible by:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Existujúcom albume:"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Odstrániť umiestnenie, značku a indentifikačné údaje o fotoaparáte pred "
 "odovzdaním"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "_Zachovať pomer podľa:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr " _pixelov"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1237
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Pôvodnej veľkosti"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Šírky alebo výšky"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Odhlásiť"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+msgid "_Publish"
+msgstr "U_verejniť"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Modul na uverejňovanie na službe Gallery3"
@@ -1467,12 +1560,17 @@ msgid "Shotwell default directory"
 msgstr "Predvolený adresár programu Shotwell"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, c-format
+#, 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"
@@ -1490,9 +1588,12 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
-#, c-format
+#, 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úbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu %s "
@@ -1539,57 +1640,57 @@ msgstr "Nerozpoznaný používateľ"
 msgid " Site Not Found"
 msgstr " Stránka sa nenašla"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_Emailová adresa"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: 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:82
+#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Za_pamätať heslo"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: 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 "Prihlásiť sa"
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Prihlásiť"
 
-#: 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
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
 msgid "An _existing album:"
 msgstr "_Existujúcom albume:"
 
-#: 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
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr "Photos will be _visible by:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Skryť album"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otvoriť cieľový _album v prehliadači"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Autorské práva (C) 2013 rajce.net"
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Autorské práva © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
@@ -1609,14 +1710,14 @@ msgstr "Neplatné užívateľské meno a/alebo heslo. Prosím, skúste to znovu.
 msgid "Invalid User Email or Password"
 msgstr "Neplatné meno používateľa alebo 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 "Ste prihlásený do služby Rajce ako %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 "Fotografie sa zobrazia v:"
 
@@ -1624,44 +1725,51 @@ msgstr "Fotografie sa zobrazia v:"
 msgid "Shotwell Extra Publishing Services"
 msgstr "Hlavné uverejňovacie služby"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogy:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
-msgstr "Veľkosť _fotky:"
+msgstr "Veľkosť _fotografie:"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Autorské práva 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1228
-msgid "500 x 375 pixels"
-msgstr "500 x 375 bodov"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1205
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#| msgid "500 x 375 pixels"
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pixelov"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1229
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 bodov"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1206
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#| msgid "1024 x 768 pixels"
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pixelov"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 bodov"
+#| msgid "1280 x 853 pixels"
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pixelov"
 
 #: 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' nie je platnou odpoveďou na autorizačnú požiadavku OAuth"
+#, fuzzy, 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“ nie je platnou odpoveďou na autorizačnú požiadavku 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( ): nedá sa spustiť; túto službu na uverejnenie nie "
 "je možné reštartovať."
@@ -1671,22 +1779,22 @@ msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Zadajte meno používateľa a heslo pre váš príslušný účet Tumblr."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "Neplatné užívateľské meno a/alebo heslo. Prosím, skúste to znovu."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Neplatné meno používateľa alebo 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 "Nepodarilo sa načítať rozhranie: %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"
@@ -1703,61 +1811,61 @@ msgstr "Autorské práva 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Navštíviť webové stránky Yandex.Fotki"
 
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:658
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Momentálne nie ste prihlásený do služby Yandex.Fotki."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Uverejniť"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
+msgstr "Priatelia"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
+msgstr "Súkromné"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albumy (alebo zadajte nový):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Typ prístupu:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Zakázať _komentáre"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Zakázať stiahnutie _pôvodnej fotografie"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Uverejniť"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
-msgid "Friends"
-msgstr "Priatelia"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Súkromné"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Uverejniť v _existujúcom albume:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Vytvoriť _nový album s názvom:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "_Veľkosť odovzdávania:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 msgstr "Videá a nové albumy budú v_iditeľné:"
 
-#: 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/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
@@ -1766,15 +1874,23 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Shotwell Connect"
 
 #: 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."
@@ -1807,23 +1923,27 @@ msgid "Large (2048 pixels)"
 msgstr "Veľká (2048 pixelov)"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
-msgstr "Testuje sa pripojenie k službe Facebook..."
+msgid "Testing connection to Facebook…"
+msgstr "Testuje sa pripojenie k službe Facebook…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:348
 #: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Vytvára sa nový album..."
+msgid "Creating album…"
+msgstr "Vytvára sa album…"
 
 #: 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 ""
 "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu "
 "Facebook nemôže pokračovať."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:982
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1832,22 +1952,22 @@ msgstr ""
 "Ste prihlásený do služby Facebook ako %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 "Kde si želáte uverejniť vybrané fotografie?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1215
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "Len pre mňa"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1216
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Všetkých"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -1859,15 +1979,15 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "Autorizačné čí_slo:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "_Pokračovať"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
+#: 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 "
+"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 ""
 "Momentálne nie ste prihlásený do služby Flickr.\n"
@@ -1876,7 +1996,7 @@ msgstr ""
 "prehliadači.  Budete musieť autorizovať Shotwell Connect odkaz na váš účet "
 "Flickr."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:64
+#: 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 "
@@ -1887,24 +2007,28 @@ msgstr ""
 "Aby ste mohli naďalej uverejňovať fotografie pomocou služby Flickr, ukončite "
 "a znova spustite Shotwell, a potom to skúste znova."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:376
-msgid "Preparing for login..."
-msgstr "Pripravuje sa na prihlásenie..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:374
+msgid "Preparing for login…"
+msgstr "Pripravuje sa prihlásenie…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:446
-#: plugins/shotwell-publishing/FlickrPublishing.vala:596
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
+#, 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 ""
 "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu "
 "Flickr nemôže pokračovať."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:459
-msgid "Verifying authorization..."
-msgstr "Overuje sa autorizácia..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
+msgid "Verifying authorization…"
+msgstr "Overuje sa autorizácia…"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1154
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -1914,80 +2038,84 @@ msgstr ""
 "\n"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736633
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1157
-#, c-format
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#, fuzzy, 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."
 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] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
 "mesiac.\n"
 "Tento mesiac vám ešte zostáva  %d  megabajtov z vašej kvóty."
-msgstr[1] ""
-"Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
-"mesiac.\n"
-"Tento mesiac vám ešte zostáva  jeden  megabajt z vašej kvóty."
-msgstr[2] ""
-"Váš Flickr účet, ktorý je zdarma, obmedzuje koľko dát môžete odovzdať za "
-"mesiac.\n"
-"Tento mesiac vám ešte zostávajú  %d  megabajty z vašej kvóty."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1161
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Váš účet služby Flickr Pro vám umožňuje neobmedzené odovzdávania fotografií."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "Fotografie _viditeľné pre:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1168
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "Videá budú v_iditeľné:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1171
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "Fotografie a videá budú v_iditeľné:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "Len pre priateľov a rodinu"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "Iba rodina"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1214
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "Iba priatelia"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1230
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 pixelov"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 pixelov"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1236
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 pixelov"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 pixelov"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
 msgid "L_ist album in public gallery"
 msgstr "_Zobraziť album vo verejnej galérii"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
 msgid "Photo _size preset:"
 msgstr "Prednastavená _veľkosť fotografie:"
 
 #: 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 ""
 "Momentálne nie ste prihlásený do služby webových albumov Picasa.\n"
 "\n"
@@ -1996,8 +2124,12 @@ msgstr ""
 "programu Shotwell Connect s vaším účtom webových albumov Picasa."
 
 #: 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 ""
 "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu "
@@ -2014,87 +2146,128 @@ msgid "Videos will appear in:"
 msgstr "Videá sa zobrazia v:"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Malá (640 x 480 pixelov)"
+#| msgid "Small (640 x 480 pixels)"
+msgid "Small (640 × 480 pixels)"
+msgstr "Malá (640 × 480 pixelov)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Stredná (1024 x 768 pixelov)"
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Stredná (1024 × 768 pixelov)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Odporúčaná (1600 x 1200 pixelov)"
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Odporúčaná (1600 × 1200 pixelov)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 bodov)"
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 pixelov)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Pôvodná veľkosť"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "User _name"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "Používateľské _meno"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+#, fuzzy
+#| msgid "_Remember Password"
+msgid "Remember Password"
 msgstr "Za_pamätať heslo"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+#, fuzzy
+#| msgid "An _existing category:"
+msgid "An _existing category"
 msgstr "_Existujúcej kategórii:"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Fotografie budú viditeľné:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Veľkosť fotky:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+#, fuzzy
+#| msgid "A _new album named:"
+msgid "A _new album named"
+msgstr "Photos will be _visible by:"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#, fuzzy
+#| msgid "within category:"
+msgid "within category"
 msgstr "v kategórii:"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Komentár k albumu:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Komentár k albumu"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+#, fuzzy
+#| msgid "Photos will be _visible by:"
+msgid "Photos will be _visible by"
+msgstr "Fotografie budú viditeľné:"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Veľkosť fotografie"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr "_Ak je zadaný názov a komentár nie, použiť názov ako komentár"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Neodovzdávať značky"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Odhlásiť sa"
 
-#: 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 "Uverejniť"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "Vytvára sa album %s..."
+msgid "Creating album %s…"
+msgstr "Vytvára sa album %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:918
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 "Vyskytla sa chybová hláška počas uverejňovania na službu Piwigo. Prosím, "
 "skúste to znovu."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:988
+#. %s is the host name that we tried to connect to
+#: 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 ""
+"Toto nevyzerá ako skutočná adresa <b>%s</b>. Útočníci sa možno pokúšajú "
+"ukradnúť, alebo pozmeniť prichádzajúce alebo odchádzajúce informácie z tejto "
+"stránky (napríklad: súkromné správy, informácie o kreditnej karte alebo "
+"heslá)."
+
+#: 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 "_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."
@@ -2102,7 +2275,7 @@ msgstr ""
 "Zadajte adresu URL vašej knižnice fotografií v službe Piwigo a taktiež "
 "patričné používateľské meno a heslo k účtu služby Piwigo pre danú knižnicu."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:989
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2110,26 +2283,38 @@ msgstr ""
 "Program Shotwell nedokáže kontaktovať vašu knižnicu v službe Piwigo. Prosím, "
 "overte vami zadanú adresu URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1019
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Neplatná adresa URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1217
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administrátori, rodina, priatelia, kontakty"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administrátori, rodina, priatelia"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administrátori, rodina"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administrátori"
 
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Pripojenie nie je bezpečné"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Zobraziť certifikát…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Rozumiem. Prosím, _pokračovať."
+
 #: plugins/shotwell-publishing/shotwell-publishing.vala:26
 msgid "Core Publishing Services"
 msgstr "Hlavné uverejňovacie služby"
@@ -2154,8 +2339,12 @@ msgstr ""
 "com/)."
 
 #: 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 ""
 "Súbor potrebný na uverejňovanie nie je dostupný. Uverejňovanie na službu "
@@ -2168,7 +2357,7 @@ msgstr "Ste prihlásený do služby YouTube ako %s."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:464
 #, c-format
-msgid "Videos will appear in '%s'"
+msgid "Videos will appear in “%s”"
 msgstr "Videá sa zobrazia v „%s“"
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:496
@@ -2266,41 +2455,36 @@ msgstr "Nepodarilo sa urobiť adresár %s zapisovateľným"
 msgid "Could not make directory %s writable: %s"
 msgstr "Nepodarilo sa urobiť adresár %s zapisovateľným: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Pripnúť panel"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Pripnúť panel nástrojov otvorený"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Opustiť režim celej obrazovky"
 
-#: src/AppWindow.vala:496
-msgid "_Contents"
-msgstr "Ob_sah"
-
-#: src/AppWindow.vala:501
-msgid "_Frequently Asked Questions"
-msgstr "Často _kladené otázky"
-
-#: src/AppWindow.vala:506
-msgid "_Report a Problem..."
-msgstr "_Nahlásiť problém..."
-
-#: src/AppWindow.vala:605 src/AppWindow.vala:626 src/AppWindow.vala:643
-#: 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
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/AppWindow.vala:653
-#, c-format
+#: src/AppWindow.vala:580
+#, 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"
@@ -2310,21 +2494,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:673
+#: src/AppWindow.vala:600
 msgid "Visit the Shotwell web site"
 msgstr "Navštíviť webovú stránku programu Shotwell"
 
-#: src/AppWindow.vala:685
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nepodarilo sa zobraziť pomocníka: %s"
 
-#: src/AppWindow.vala:693
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nepodarilo sa prejsť do databázy chýb: %s"
 
-#: src/AppWindow.vala:701
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nepodarilo sa zobraziť FAQ: %s"
@@ -2395,18 +2579,23 @@ 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"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 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."
+"Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
 "Nepodarilo sa odpojiť fotoaparát. Skúste odpojiť fotoaparát pomocou správcu "
 "súborov."
@@ -2420,43 +2609,33 @@ msgstr "Skryť fotografie, ktoré sú už importované"
 msgid "Only display photos that have not been imported"
 msgstr "Zobraziť iba fotografie, ktoré neboli importované"
 
-#. 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:846
-msgid "Starting import, please wait..."
-msgstr "Začína sa import, prosím, čakajte..."
-
-#: 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 "Zobraziť názov každej fotografie"
-
-#: src/camera/ImportPage.vala:885
+#: src/camera/ImportPage.vala:815 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importovať vy_brané"
 
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importovať vybrané fotografie do vašej knižnice"
-
-#: src/camera/ImportPage.vala:891
+#: src/camera/ImportPage.vala:825 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importovať _všetky"
 
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importovať všetky fotografie do vašej knižnice"
+#: src/camera/ImportPage.vala:849
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+"Zdá sa, že fotoaparát je prázdny. Nenašli sa žiadne fotografie ani videá na "
+"importovanie."
+
+#: src/camera/ImportPage.vala:853
+msgid "No new photos/videos found on camera"
+msgstr "Vo fotoaparáte neboli nájdené žiadne nové fotografie alebo videá"
 
 #. 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?"
+"it. Continue?"
 msgstr ""
 "Shotwell potrebuje odpojiť váš fotoaparát od súborového systému, aby k nemu "
 "mohol pristupovať.  Chcete pokračovať?"
@@ -2471,13 +2650,13 @@ msgstr "Prosím, odpojte fotoaparát."
 
 #: 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 ""
-"Fotoaparát je uzamknutý inou aplikáciou.  Shotwell môže pristupovať k "
-"fotoaparátu iba ak nie je uzamknutý.  Zatvorte, prosím, ostatné aplikácie, "
-"ktoré používajú fotoaparát, a skúste to znova."
+"Fotoaparát je uzamknutý inou aplikáciou. Program Shotwell môže pristupovať k "
+"fotoaparátu iba ak je odomknutý. Zatvorte, prosím, ostatné aplikácie, ktoré "
+"používajú fotoaparát, a skúste to znova."
 
 #: src/camera/ImportPage.vala:1039
 msgid "Please close any other application using the camera."
@@ -2493,24 +2672,28 @@ msgstr ""
 "%s"
 
 #: src/camera/ImportPage.vala:1061
-msgid "Unmounting..."
-msgstr "Odpája sa..."
+msgid "Unmounting…"
+msgstr "Odpája sa…"
+
+#: src/camera/ImportPage.vala:1152
+msgid "Starting import, please wait…"
+msgstr "Spúšťa sa importovanie. Prosím, čakajte…"
 
-#: src/camera/ImportPage.vala:1167
+#: src/camera/ImportPage.vala:1169
 msgid "Fetching photo information"
 msgstr "Získavajú sa informácie o fotografiách"
 
-#: src/camera/ImportPage.vala:1522
+#: src/camera/ImportPage.vala:1527
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získava sa náhľad pre %s"
 
-#: src/camera/ImportPage.vala:1638
+#: src/camera/ImportPage.vala:1643
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nepodarilo sa uzamknúť fotoaparát: %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?"
@@ -2518,7 +2701,7 @@ msgstr[0] "Odstrániť týchto %d fotografií z fotoaparátu?"
 msgstr[1] "Odstrániť túto fotografiu z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d fotografie z fotoaparátu?"
 
-#: 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?"
@@ -2526,7 +2709,7 @@ msgstr[0] "Odstrániť týchto %d videí z fotoaparátu?"
 msgstr[1] "Odstrániť toto %d video z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d videá z fotoaparátu?"
 
-#: 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?"
@@ -2534,7 +2717,7 @@ msgstr[0] "Odstrániť týchto %d fotografií/videí z fotoaparátu?"
 msgstr[1] "Odstrániť túto %d fotografiu/video z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d fotografie/videá z fotoaparátu?"
 
-#: 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?"
@@ -2542,15 +2725,15 @@ msgstr[0] "Odstrániť týchto %d súborov z fotoaparátu?"
 msgstr[1] "Odstrániť tento %d súbor z fotoaparátu?"
 msgstr[2] "Odstrániť tieto %d súbory z fotoaparátu?"
 
-#: src/camera/ImportPage.vala:1740 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: src/camera/ImportPage.vala:1759
+#: src/camera/ImportPage.vala:1764
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňujú sa fotografie/videá z fotoaparátu"
 
-#: 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."
@@ -2561,51 +2744,129 @@ msgstr[1] ""
 msgstr[2] ""
 "Nepodarilo sa odstrániť %d fotografie/videá z fotoaparátu kvôli chybám."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2460 src/Resources.vala:170
+msgid "_Print"
+msgstr "_Tlačiť"
+
+# dialog title
+#: 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 "Odoslať _do…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2470 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Nastaviť ako _pozadie pracovnej plochy"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "Du_plikovať"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Na celú obrazovku"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "P_rezentácia"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Spustiť prezentáciu"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Otočiť do_prava"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Otočiť doľa_va"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Prevrátiť vodo_rovne"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Prevrátiť _zvislo"
+
+#: 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 "Vy_lepšiť"
+
+#: 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 "Vrátiť do _pôvodného stavu"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Kopírovať úpravu farieb"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Vložiť úpravu farieb"
 
-#: src/CollectionPage.vala:456
+# window title
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Upraviť dátum a čas…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "Otvoriť pomocou e_xterného editora"
+
+#: 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 "Otvoriť pomocou RA_W editora"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "_Spustiť"
+
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Exportovať fotografiu/video"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Exportovať fotografie/videá"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
 msgid "Export Photo"
 msgstr "Exportovať fotografiu"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exportovať fotografie"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Otáča sa"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Vracia sa spať otáčanie"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Prevracia sa horizontálne"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Vracia sa prevrátenie horizontálne"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Prevracia sa vertikálne"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Vracia sa prevrátenie vertikálne"
 
@@ -2736,8 +2997,9 @@ msgid "Create Tag"
 msgstr "Vytvoriť značku"
 
 #: src/Commands.vala:1695
-#, c-format
-msgid "Move Tag \"%s\""
+#, fuzzy, c-format
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Presunúť značku „%s“"
 
 #: src/Commands.vala:2347
@@ -2797,8 +3059,9 @@ msgstr "%s databáza"
 
 #: 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:"
+#, 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 "Importovanie z %s nemôže pokračovať, pretože sa vyskytla chyba:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
@@ -2822,7 +3085,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Súbor databázy:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
 msgid "_Import"
 msgstr "_Importovať"
 
@@ -2834,7 +3097,7 @@ msgstr "Importovať z aplikácie"
 msgid "Import media _from:"
 msgstr "Importovať multimédiá _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 "Za_vrieť"
 
@@ -2870,7 +3133,7 @@ msgstr ""
 "Popis chyby: \n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "Nie je možné obnoviť databázu fotografií %s"
@@ -2896,9 +3159,11 @@ msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Nepodarilo sa pripraviť prezentáciu pre pracovnú plochu: %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?"
+#, 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] ""
 "Táto operácia odstráni značku „%s“ z %d fotografií. Chcete pokračovať?"
 msgstr[1] ""
@@ -2906,15 +3171,17 @@ msgstr[1] ""
 msgstr[2] ""
 "Táto operácia odstráni značku „%s“ z %d fotografií. Chcete pokračovať?"
 
-#: 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
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "O_dstrániť"
 
 #: src/Dialogs.vala:25
-#, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#, fuzzy, c-format
+#| msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Táto operácia odstráni uložené vyhľadávanie „%s“. Chcete pokračovať?"
 
 #: src/Dialogs.vala:36
@@ -2925,14 +3192,14 @@ msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
 msgstr[0] ""
-"Prepnutie vývojára zruší všetky zmeny, ktoré ste uskutočnili na tejto fotke "
-"v programe Shotwell"
-msgstr[1] ""
 "Prepnutie vývojára zruší všetky zmeny, ktoré ste uskutočnili na týchto "
-"fotkách v programe Shotwell"
+"fotografiách v programe Shotwell"
+msgstr[1] ""
+"Prepnutie vývojára zruší všetky zmeny, ktoré ste uskutočnili na tejto "
+"fotografii v programe Shotwell"
 msgstr[2] ""
 "Prepnutie vývojára zruší všetky zmeny, ktoré ste uskutočnili na týchto "
-"fotkách v programe Shotwell"
+"fotografiách v programe Shotwell"
 
 #: src/Dialogs.vala:40
 msgid "_Switch Developer"
@@ -2947,16 +3214,19 @@ msgstr "Exportovať 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
-#, 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 nemohol vytvoriť súbor na úpravu tejto fotografie, pretože nemáte "
 "právo zápisu do %s."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -2964,7 +3234,7 @@ msgstr ""
 "Nie je možné exportovať následujúcu fotografiu kvôli súborovej chybe.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -2977,54 +3247,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 "Nezmenený"
 
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Aktuálny"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Formát:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Kvalita:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Zachovať pomer podľa:"
 
-#: src/Dialogs.vala:225
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Pixely:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Exportovať metaúdaje"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "Exportovať _metaúdaje:"
 
-#: src/Dialogs.vala:462
-msgid "Save Details..."
-msgstr "Uložiť podrobnosti..."
+# dialog title
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Uložiť podrobnosti…"
 
 # dialog title
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Uloženie podrobností"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(a %d naviac)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Hlásenie o výsledkoch importovania"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3032,7 +3303,7 @@ msgstr[0] "Pokúsilo sa importovať %d súborov."
 msgstr[1] "Pokúsilo sa importovať jeden súbor."
 msgstr[2] "Pokúsilo sa importovať %d súbory."
 
-#: 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."
@@ -3043,31 +3314,34 @@ msgstr[2] "Z týchto súborov boli úspešne importované %d."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikátne fotografie/videá, ktoré neboli importované:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "duplikátna položka existujúceho multimédia"
 
 #.
 #. 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 "Fotografie/videá neboli importované kvôli problémom s fotoaparátom:"
 
-#: 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 "Správa o chybe:"
 
 #.
 #. 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
+#, 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 ""
 "Súbory neboli importované, pretože neboli rozpoznané ako fotografie alebo "
 "videá:"
@@ -3075,9 +3349,13 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:594
+#: 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 ""
 "Fotografie/videá neboli importované, pretože boli pre program Shotwell v "
@@ -3086,38 +3364,42 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: 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 ""
 "Fotografie/videá neboli importované, pretože program Shotwell ich nedokáže "
 "skopírovať do svojej knižnice:"
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
-"nedá sa kopírovať %s\n"
+"nepodarilo sa skopírovať %s\n"
 "\tdo %s"
 
 #.
 #. 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 "Fotografie/videá neboli importované, pretože súbory sú poškodené:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografie/videá neboli importované kvôli iným dôvodom:"
 
-#: 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"
@@ -3125,7 +3407,7 @@ msgstr[0] "%d duplikátnych fotografií nebolo importovaných:\n"
 msgstr[1] "1 duplikátna fotografia nebola importovaná:\n"
 msgstr[2] "%d duplikátne fotografie neboli importované:\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"
@@ -3133,7 +3415,7 @@ msgstr[0] "%d duplicitných videí nebolo importovaných:\n"
 msgstr[1] "1 duplicitné video nebolo importované:\n"
 msgstr[2] "%d duplicitné videá neboli importované:\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"
@@ -3141,7 +3423,7 @@ msgstr[0] "%d duplicitných fotografií/videí nebolo importovaných:\n"
 msgstr[1] "1 duplicitná fotografia/video nebola importovaná:\n"
 msgstr[2] "%d duplicitné fotografie/videá neboli importované:\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"
@@ -3155,7 +3437,7 @@ msgstr[2] ""
 "%d fotografie sa nepodarilo importovať kvôli súborovej alebo hardvérovej "
 "chybe:\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"
@@ -3166,7 +3448,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d videá sa nepodarilo importovať kvôli súborovej alebo hardvérovej chybe:\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 ""
@@ -3181,7 +3463,7 @@ msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať kvôli súborovej alebo "
 "hardvérovej chybe:\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"
@@ -3193,7 +3475,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d súbory sa nepodarilo importovať kvôli súborovej alebo hardvérovej chybe:\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"
@@ -3210,7 +3492,7 @@ msgstr[2] ""
 "%d fotografie sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\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"
@@ -3227,7 +3509,7 @@ msgstr[2] ""
 "%d videá sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\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 "
@@ -3245,7 +3527,7 @@ msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať, pretože do priečinka s "
 "knižnicou fotografií sa nedá zapisovať:\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"
@@ -3262,7 +3544,7 @@ msgstr[2] ""
 "%d súbory sa nepodarilo importovať, pretože do priečinka s knižnicou "
 "fotografií sa nedá zapisovať:\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"
@@ -3270,7 +3552,7 @@ msgstr[0] "%d fotografií sa nepodarilo importovať kvôli chybe fotoaparátu:\n
 msgstr[1] "1 fotografiu sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d fotografie sa nepodarilo importovať kvôli chybe fotoaparátu:\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"
@@ -3278,7 +3560,7 @@ msgstr[0] "%d videí sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[1] "1 video sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d videá sa nepodarilo importovať kvôli chybe fotoaparátu:\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"
@@ -3289,7 +3571,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografie/videá sa nepodarilo importovať kvôli chybe fotoaparátu:\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"
@@ -3297,7 +3579,7 @@ msgstr[0] "%d súborov sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[1] "1 súbor sa nepodarilo importovať kvôli chybe fotoaparátu:\n"
 msgstr[2] "%d súbory sa nepodarilo importovať kvôli chybe fotoaparátu:\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"
@@ -3305,7 +3587,7 @@ msgstr[0] "Importovanie %d fotografií zlyhalo, pretože boli poškodené:\n"
 msgstr[1] "Importovanie jednej fotografie zlyhalo, pretože bola poškodená:\n"
 msgstr[2] "Importovanie %d fotografií zlyhalo, pretože boli poškodené:\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"
@@ -3313,7 +3595,7 @@ msgstr[0] "Importovanie %d videí zlyhalo, pretože boli poškodené:\n"
 msgstr[1] "Importovanie jedného videa zlyhalo, pretože bolo poškodené:\n"
 msgstr[2] "Importovanie %d videí zlyhalo, pretože boli poškodené:\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"
@@ -3322,7 +3604,7 @@ msgstr[1] ""
 "Importovanie jednej fotografie/videa zlyhalo, pretože bolo poškodené:\n"
 msgstr[2] "Importovanie %d fotografií/videí zlyhalo, pretože boli poškodené:\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"
@@ -3334,7 +3616,7 @@ msgstr[2] "Importovanie %d súborov zlyhalo, pretože boli poškodené:\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"
@@ -3344,7 +3626,7 @@ msgstr[2] "%d nepodporované fotografie boli preskočené:\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"
@@ -3352,7 +3634,7 @@ msgstr[0] "%d súborov, ktoré nie sú obrázkami, bolo preskočených.\n"
 msgstr[1] "Jeden súbor, ktorý nie je obrázok, bol preskočený.\n"
 msgstr[2] "%d súbory, ktorý nie sú obrázkami, boli preskočené.\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"
@@ -3360,7 +3642,7 @@ msgstr[0] "%d fotografií bolo preskočených kvôli prerušeniu používateľom
 msgstr[1] "Jedna fotografia bola preskočená kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d fotografie boli preskočené kvôli prerušeniu používateľom:\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"
@@ -3368,7 +3650,7 @@ msgstr[0] "%d videí bolo preskočených kvôli prerušeniu používateľom:\n"
 msgstr[1] "Jedno video bolo preskočené kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d videá bolí preskočené kvôli prerušeniu používateľom:\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"
@@ -3379,7 +3661,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografií/videí bolo preskočených kvôli prerušeniu používateľom:\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"
@@ -3387,7 +3669,7 @@ msgstr[0] "%d súborov bolo preskočených kvôli prerušeniu používateľom:\n
 msgstr[1] "Jeden súbor bol preskočený kvôli prerušeniu používateľom:\n"
 msgstr[2] "%d súbory boli preskočené kvôli prerušeniu používateľom:\n"
 
-#: src/Dialogs.vala:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3395,7 +3677,7 @@ msgstr[0] "%d fotografií bolo úspešne importovaných.\n"
 msgstr[1] "Jedna fotografia bola úspešne importovaná.\n"
 msgstr[2] "%d fotografie boli úspešne importované.\n"
 
-#: src/Dialogs.vala:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3403,7 +3685,7 @@ msgstr[0] "%d videí bolo úspešne importovaných.\n"
 msgstr[1] "Jedno video bolo úspešne importované.\n"
 msgstr[2] "%d videá bolo úspešne importované.\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"
@@ -3413,15 +3695,15 @@ msgstr[2] "%d fotografie/videá boli úspešne importované.\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 "Žiadne fotografie ani videá neboli importované.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Importovanie dokončené"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3429,7 +3711,7 @@ msgstr[0] "%d sekúnd"
 msgstr[1] "%d sekunda"
 msgstr[2] "%d sekundy"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3437,7 +3719,7 @@ msgstr[0] "%d minút"
 msgstr[1] "%d minúta"
 msgstr[2] "%d minúty"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3445,68 +3727,71 @@ msgstr[0] "%d hodín"
 msgstr[1] "%d hodina"
 msgstr[2] "%d hodiny"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 deň"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Premenovať udalosť"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Názov:"
 
 # DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251
 #. Dialog title
-#: src/Dialogs.vala:1333
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Úprava názvu"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Názov:"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Upravenie komentára k udalosti"
 
 # window title
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Úprava komentáru k fotografii/videu"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Vyhodiť súbory do koša"
 msgstr[1] "_Vyhodiť súbor do koša"
 msgstr[2] "_Vyhodiť súbory do koša"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Odstrániť z knižnice"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Vrátiť externú úpravu?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Vrátiť externé úpravy?"
 
-#: src/Dialogs.vala:1417
-#, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+#: src/Dialogs.vala:1412
+#, 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] ""
 "Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. "
 "Pokračovať?"
@@ -3516,31 +3801,33 @@ msgstr[2] ""
 "Táto operácia zničí všetky zmeny vykonané na %d externých súboroch. "
 "Pokračovať?"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "V_rátiť externé úpravy"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "V_rátiť externé úpravy"
 
-#: 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?"
+#: src/Dialogs.vala:1437
+#, 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] "Táto operácia odstráni %d fotografií z knižnice. Chcete pokračovať?"
 msgstr[1] "Táto operácia odstráni fotografiu z knižnice. Chcete pokračovať?"
 msgstr[2] "Táto operácia odstráni %d fotografie z knižnice. Chcete pokračovať?"
 
-#: src/Dialogs.vala:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Odstrániť fotografie z knižnice"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Odstrániť fotografie z knižnice"
 
@@ -3569,35 +3856,33 @@ msgstr "_Posunúť fotografie/videá o rovnakú hodnotu"
 msgid "Set _all photos/videos to this time"
 msgstr "Nastaviť _všetky fotografie/videá na tento čas"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "_Zmeniť pôvodný súbor fotky"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo files"
-msgstr "_Zmeniť pôvodné súbory fotiek"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Zmeniť pôvodné súbory fotografií"
+msgstr[1] "_Zmeniť pôvodný súbor fotografie"
+msgstr[2] "_Zmeniť pôvodné súbory fotografií"
 
 #: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "_Upraviť pôvodné súbory"
+msgid_plural "_Modify original files"
+msgstr[0] "_Upraviť pôvodné súbory"
+msgstr[1] "_Upraviť pôvodný súbor"
+msgstr[2] "_Upraviť pôvodné súbory"
 
-#: src/Dialogs.vala:1729
-msgid "_Modify original files"
-msgstr "_Zmeniť pôvodné súbory"
-
-#: src/Dialogs.vala:1815
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Originál: "
 
-#: src/Dialogs.vala:1816
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%H:%M:%S %p, %d. %b %Y"
 
-#: src/Dialogs.vala:1817
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%I:%M:%S %p, %d. %b %Y"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3606,7 +3891,7 @@ msgstr ""
 "Doba expozície sa posunie vpred o\n"
 "%d %s, %d %s, %d %s, a %d %s."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3615,35 +3900,35 @@ msgstr ""
 "Doba expozície sa posunie dozadu o\n"
 "%d %s, %d %s, %d %s, a %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dní"
 msgstr[1] "deň"
 msgstr[2] "dni"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodín"
 msgstr[1] "hodina"
 msgstr[2] "hodiny"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minút"
 msgstr[1] "minúta"
 msgstr[2] "minúty"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekúnd"
 msgstr[1] "sekunda"
 msgstr[2] "sekundy"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3666,49 +3951,49 @@ msgstr[2] ""
 "\n"
 "A %d ďalšie."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Značky (oddelené čiarkou):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Vitajte!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Vitajte v Shotwell!"
 
-#: src/Dialogs.vala:2098
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Aby ste začali, importujte fotografie jedným z následujúcich spôsobov:"
 
-#: src/Dialogs.vala:2117
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Zvoľte <span weight=\"bold\">Importovať súbor %s z priečinka</span>"
 
-#: src/Dialogs.vala:2118
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Pretiahnite fotografie do Shotwell okna"
 
-#: src/Dialogs.vala:2119
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Pripojte fotoaparát k vášmu počítaču a importujte"
 
-#: src/Dialogs.vala:2129
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importovať fotografie z vášho priečinka %s"
 
-#: src/Dialogs.vala:2136
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "Takisto môžete importovať fotografie jedným z následujúcich spôsobov:"
 
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "_Nezobrazovať znova túto správu"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importovať fotografie z vašej knižnice %s"
@@ -3716,41 +4001,41 @@ msgstr "Importovať fotografie z vašej knižnice %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
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Pomocník)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%sMesiac%sDeň"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%sMesiac"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%sMesiac-Deň"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Rok-Mesiac-Deň"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Vlastný"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: src/Dialogs.vala:2590
 msgid "Invalid pattern"
 msgstr "Chybný vzorec"
 
 #. 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:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3758,40 +4043,50 @@ msgstr ""
 "Shotwell môže skopírovať fotografie do vášho priečinka s knižnicou alebo ich "
 "importovať bez kopírovania."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Ko_pírovať fotografie"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importovať na mieste"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Importovať do knižnice"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
 msgid "Remove From Library"
 msgstr "Odstrániť z knižnice"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje sa fotografia z knižnice"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Odstraňujú sa fotografie z knižnice"
 
-#: src/Dialogs.vala:2719
-#, c-format
-msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+#: src/Dialogs.vala:2724
+#, 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 "
 "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] ""
@@ -3812,15 +4107,25 @@ msgstr[2] ""
 "\n"
 "Táto operácia sa nedá vrátiť späť."
 
-#: src/Dialogs.vala:2723
-#, c-format
-msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+#: src/Dialogs.vala:2728
+#, 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 "
 "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."
@@ -3840,15 +4145,25 @@ msgstr[2] ""
 "\n"
 "Táto operácia sa nedá vrátiť späť."
 
-#: src/Dialogs.vala:2727
-#, c-format
-msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+#: src/Dialogs.vala:2732
+#, 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 "
 "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."
@@ -3868,12 +4183,18 @@ msgstr[2] ""
 "\n"
 "Táto akcie nemôže byť vrátená späť."
 
-#: src/Dialogs.vala:2759
-#, c-format
+#: src/Dialogs.vala:2764
+#, 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 fotografií/videí sa nedá presunúť do koša na vašej pracovnej ploche.  "
 "Chcete tieto súbory odstrániť?"
@@ -3885,7 +4206,7 @@ msgstr[2] ""
 "Chcete tieto súbory odstrániť?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2776
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3901,127 +4222,17 @@ msgstr "Šírky"
 msgid "Height"
 msgstr "Výšky"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Súbor"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Uložiť"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Uložiť fotografiu"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Uložiť _ako..."
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Uložiť fotografiu pod novým názvom"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Vytlačiť fotografiu na tlačiarni pripojenej k vášmu počítaču"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotografia"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "Nás_troje"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "_Predchádzajúca fotografia"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Predchádzajúca fotografia"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "Ďa_lšia fotografia"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Ďalšia fotografia"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Zobraziť"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "_Priblížiť"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Zvýšiť zväčšenie fotografie"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "_Vzdialiť"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Zmenšiť zväčšenie fotografie"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Prispôsobiť _strane"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Zväčšiť fotografiu na veľkosť obrazovky"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Mierka _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Priblížiť fotografiu na 100% zväčšenie"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Mierka _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Priblížiť fotografiu na 200% zväčšenie"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s nie je súbor."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4030,30 +4241,34 @@ msgstr ""
 "%s nepodporuje súborový formát\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Nie je možné otvoriť fotografiu %s. Prepáčte."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Uložiť"
+
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr "_Uložiť kópiu"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Zahodiť zmeny vo %s?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr "Zavrieť _bez uloženia"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Chyba počas ukladania do %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
 msgid "Save As"
 msgstr "Uložiť ako"
 
@@ -4064,195 +4279,227 @@ msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nepodarilo sa sledovať %s: Nie je to adresár (%s)"
 
 # tooltip
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Vráti sa k súčasným rozmerom fotografie"
 
 # tooltip
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Nastaví orezanie pre túto fotografiu"
 
 # tooltip
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Prepne obdĺžnik výrezu medzi vertikálnou a horizontálnou orientáciou"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Neobmedzený"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Štvorec"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Širokoúhly"
 
-#: 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:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:758
-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 "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
+msgstr "Video v nízkom rozlíšení (4 ∶ 3)"
+
+#: src/editing_tools/EditingTools.vala:760
+#| msgid "HD Video (16 : 9)"
+msgid "HD Video (16 ∶ 9)"
+msgstr "Video vo vysokom rozlíšení (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:817
-msgid "Wallet (2 x 3 in.)"
-msgstr "Peňaženka (2 x 3 palce)"
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+#| msgid "Wallet (2 x 3 in.)"
+msgid "Wallet (2 × 3 in.)"
+msgstr "Peňaženka (2 × 3 palcov)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:820
-msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+#, fuzzy
+#| msgid "Notecard (3 x 5 in.)"
+msgid "Notecard (3 × 5 in.)"
 msgstr "Zápisník (3 x 5 palcov)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:823
-msgid "4 x 6 in."
-msgstr "4 x 6 palcov"
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+#| msgid "4 x 6 in."
+msgid "4 × 6 in."
+msgstr "4 × 6 palcov"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:826
-msgid "5 x 7 in."
-msgstr "5 x 7 palcov"
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#| msgid "5 x 7 in."
+msgid "5 × 7 in."
+msgstr "5 × 7 palcov"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:829
-msgid "8 x 10 in."
-msgstr "8 x 10 palcov"
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#| msgid "8 x 10 in."
+msgid "8 × 10 in."
+msgstr "8 × 10 palcov"
 
-#: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:767
+#, fuzzy
+#| msgid "Letter (8.5 x 11 in.)"
+msgid "Letter (8.5 × 11 in.)"
 msgstr "Dopis (8.5 x 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:832
-msgid "11 x 14 in."
-msgstr "11 x 14 palcov"
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+#| msgid "11 x 14 in."
+msgid "11 × 14 in."
+msgstr "11 × 14 palcov"
 
-#: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:769
+#, fuzzy
+#| msgid "Tabloid (11 x 17 in.)"
+msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 x 17 palca)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:835
-msgid "16 x 20 in."
-msgstr "16 x 20 palcov"
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+#| msgid "16 x 20 in."
+msgid "16 × 20 in."
+msgstr "16 × 20 palcov"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:841
-msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+#, fuzzy
+#| msgid "Metric Wallet (9 x 13 cm)"
+msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrická peňaženka (9 x 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:844
-msgid "Postcard (10 x 15 cm)"
-msgstr "Pohľadnica (10 x 15 cm)"
-
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:847
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
-
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:850
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+#| msgid "Postcard (10 x 15 cm)"
+msgid "Postcard (10 × 15 cm)"
+msgstr "Pohľadnica (10 × 15 cm)"
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+#| msgid "13 x 18 cm"
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+#| msgid "18 x 24 cm"
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
+
+#: src/editing_tools/EditingTools.vala:776
+#| msgid "A4 (210 x 297 mm)"
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+#| msgid "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+#| msgid "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+#| msgid "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
-
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:853
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
-
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:856
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
-
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:859
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
-
-#: src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:780
+#| 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
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Zavrieť nástroj na odstraňovanie červených očí"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Odstrániť efekt červených očí vo vybranej oblasti"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: src/editing_tools/EditingTools.vala:2238
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Obnoviť"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2240 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Expozícia:"
 
-#: src/editing_tools/EditingTools.vala:2248
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Sýtosť:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Sfarbenie:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: src/editing_tools/EditingTools.vala:2273
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Tiene:"
 
-#: src/editing_tools/EditingTools.vala:2281
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Zvýraznenie:"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Obnoviť farby"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Obnoviť všetky úpravy farby na pôvodné hodnoty"
 
-#: src/editing_tools/EditingTools.vala:2687
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/editing_tools/EditingTools.vala:2700
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Sfarbenie"
 
-#: src/editing_tools/EditingTools.vala:2713
+#: src/editing_tools/EditingTools.vala:2746
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Sýtosť"
 
-#: src/editing_tools/EditingTools.vala:2726
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Expozícia"
 
-#: src/editing_tools/EditingTools.vala:2739
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Tiene"
 
-#: src/editing_tools/EditingTools.vala:2752
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Zvýraznenie"
 
-#: src/editing_tools/EditingTools.vala:2762
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Rozšíriť kontrast"
 
@@ -4261,6 +4508,7 @@ msgid "Angle:"
 msgstr "Uhol:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Vyrovnať"
 
@@ -4276,7 +4524,7 @@ msgstr[0] "%d Fotografií/Videí"
 msgstr[1] "%d Fotografia/Video"
 msgstr[2] "%d Fotografie/Videá"
 
-#: 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"
@@ -4284,7 +4532,7 @@ msgstr[0] "%d videí"
 msgstr[1] "%d video"
 msgstr[2] "%d videá"
 
-#: 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"
@@ -4292,45 +4540,36 @@ msgstr[0] "%d fotografií"
 msgstr[1] "%d fotografia"
 msgstr[2] "%d fotografie"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Žiadna udalosť"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "Komentár"
-
-# tooltip
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Zobrazí komentár ku každej udalosti"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Žiadne udalosti"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Neboli nájdené žiadne udalosti"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Všetky udalosti"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Bez dátumu"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:243
 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 "Udalosť %s"
@@ -4347,8 +4586,8 @@ msgstr "Exportovanie"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Súbor %s už existuje. Chcete ho nahradiť?"
+msgid "File %s already exists. Replace?"
+msgstr "Súbor %s už existuje. Má sa nahradiť?"
 
 #: src/Exporter.vala:319
 msgid "_Skip"
@@ -4366,41 +4605,32 @@ msgstr "Nahradiť _všetko"
 msgid "Export"
 msgstr "Export"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Priečinky"
 
-#: 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 "Knižnica"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:594
-#: src/SearchFilter.vala:595
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Fotografie"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:588
-#: src/SearchFilter.vala:589 src/SearchFilter.vala:988
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Označené"
 
 #: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Importuje sa..."
-
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Zastaviť importovanie"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Zastaviť importovanie fotografií"
+msgid "Importing…"
+msgstr "Importuje sa…"
 
-#: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Pripravuje sa importovanie..."
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "Pripravuje sa importovanie…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Importovaný súbor „%s“"
@@ -4409,130 +4639,19 @@ msgstr "Importovaný súbor „%s“"
 msgid "Last Import"
 msgstr "Posledné importovanie"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Importovať z priečinka..."
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importovať fotografie z disku do knižnice"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Importovať z _aplikácie..."
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Zora_diť udalosti"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "_Vyprázdniť kôš"
-
-# tooltip
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Odstráni všetky fotografie v koši"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Zobraziť u_dalosť fotografie"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Nájsť"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Nájsť fotografie a videá podľa kritérií hľadania"
-
-#: 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é vyhľadávanie..."
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotografie"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "U_dalosti"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Značky"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Základné informácie"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Zobraziť základné informácie pre výber"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "_Rozšírené informácie"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Zobraziť rozšírené informácie pre výber"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Panel vyhľadávania"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Zobrazí panel vyhľadávania"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Bočný panel"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Zobraz bočný panel"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "Panel _nástrojov"
-
-# tooltip
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Zobrazí panel nástrojov"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "Vz_ostupne"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Usporiadať fotografie vo vzostupnom poradí"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "Zo_stupne"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Usporiadať fotografie v zostupnom poradí"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:505
 msgid "Import From Folder"
 msgstr "Importovať z priečinka"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash..."
-msgstr "Vyprázdňuje sa kôš..."
+#: src/library/LibraryWindow.vala:574
+msgid "Emptying Trash…"
+msgstr "Vyprázdňuje sa kôš…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:770
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4546,43 +4665,49 @@ msgstr ""
 "programu %s</span>.\n"
 "Chcete pokračovať s importovaním fotografií?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Umiestnenie knižnice"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:786
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotografie sa nedajú importovať z tohto adresára."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1066
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-msgid "Updating library..."
-msgstr "Aktualizuje sa knižnica..."
+#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
+msgid "Updating library…"
+msgstr "Aktualizuje sa knižnica…"
 
-#: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1127
+#, fuzzy
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
 msgstr "Pripravuje sa automatické importovanie fotografií..."
 
-#: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1132
+#, fuzzy
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
 msgstr "Prebieha automatické importovanie fotografií..."
 
-#: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1140
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
 msgstr "Zapisujú sa metaúdaje do súborov..."
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Chýbajúce súbory"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Odstraňuje sa..."
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Odstraňuje sa…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4601,11 +4726,15 @@ msgid "Deleting Photos"
 msgstr "Odstraňujú sa fotografie"
 
 #: src/main.vala:54
-#, c-format
+#, 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."
+"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 ""
 "Vaša knižnica fotografií nie je kompatibilná s touto verziou programu "
 "Shotwell.  Zdá sa, že bola vytvorená programom Shotwell %s (schéma %d). Táto "
@@ -4613,10 +4742,14 @@ msgstr ""
 "Shotwell."
 
 #: src/main.vala:59
-#, c-format
+#, 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 "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
 "Shotwell nebol schopný zmeniť verziu vašej knižnice fotografií z %s (schéma "
@@ -4624,11 +4757,16 @@ msgstr ""
 "programu Shotwell na %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 "
+#, 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 ""
 "Vaša knižnica fotografií nie je kompatibilná s touto verziou programu "
@@ -4637,8 +4775,9 @@ msgstr ""
 "%s a znovu importujte vaše fotografie."
 
 #: src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+#, fuzzy, c-format
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Neznáma chyba pri pokuse o overenie databázy programu Shotwell: %s"
 
 #: src/main.vala:104
@@ -4646,7 +4785,9 @@ msgid "Loading Shotwell"
 msgstr "Načítavam Shotwell"
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+#, fuzzy
+#| msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "Cesta k súkromným údajom programu Shotwell"
 
 #: src/main.vala:294
@@ -4660,12 +4801,16 @@ msgstr "Nebude sledovať zmeny v adresári s knižnicou pri spustení"
 
 # cmd desc
 #: src/main.vala:302
-msgid "Don't display startup progress meter"
+#, fuzzy
+#| msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Po spustení nezobrazí ukazovateľ priebehu"
 
 # cmd desc
 #: src/main.vala:306
-msgid "Show the application's version"
+#, fuzzy
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Zobrazí verziu aplikácie"
 
 #. init GTK (valac has already called g_threads_init())
@@ -4674,8 +4819,10 @@ msgid "[FILE]"
 msgstr "[SÚBOR]"
 
 #: src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+#, 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 ""
 "Spustením '%s --help' zobrazíte úplný zoznam dostupných volieb príkazového "
 "riadku.\n"
@@ -4690,72 +4837,7 @@ msgstr "Nie je možné spracovať aktualizácie sledovania: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Upraví veľkosť náhľadov"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Zvýšiť zväčšenie nadhľadov"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Zmenšiť zväčšenie nadhľadov"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Usporiadať _fotografie"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Prehrať video"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Otvoriť vybrané videá v systémovom prehrávači videa"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Vývojár"
-
-# tooltip
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Zobrazí komentár ku každej fotografii"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Zobraziť značky každej fotografie"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Podľa _názvu"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Usporiadať fotografie podľa názvu"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Podľa _dátumu vytvorenie"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Usporiadať fotografie podľa dátumu vytvorenia"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Podľa  _hodnotenia"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Usporiadať fotografie podľa hodnotenia"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Podľa názvu _súboru"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Usporiada fotografie podľa názvu súboru"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4764,36 +4846,36 @@ msgstr ""
 "Shotwell nebol schopný prehrať vybrané video: \n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1304
 msgid "No photos/videos"
 msgstr "Žiadne fotografie/videá"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1308
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 "Nenašli sa žiadne fotografie alebo videá, ktoré by vyhovovali aktuálnemu "
 "filtru"
 
-#: src/Page.vala:2568
+#: src/Page.vala:2614
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nemôžu byť exportované do tohoto adresára."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Predchádzajúca fotografia"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Ďalšia fotografia"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Chýba zdrojový súbor fotografie: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3014
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nepodarilo sa exportovať %s: %s"
@@ -4878,15 +4960,15 @@ msgstr "palcov"
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:875
+#: src/Printing.vala:876
 msgid "Image Settings"
 msgstr "Nastavenia obrázka"
 
-#: src/Printing.vala:888
-msgid "Printing..."
-msgstr "Tlačí sa..."
+#: src/Printing.vala:889
+msgid "Printing…"
+msgstr "Tlačí sa…"
 
-#: src/Printing.vala:908 src/Printing.vala:1111
+#: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -4897,19 +4979,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Dnes"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Včera"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Položky:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -4918,104 +5000,104 @@ msgstr[1] "%d udalosť"
 msgstr[2] "%d udalosti"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Dátum:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Čas:"
 
 #. 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 "Od:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Do:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Trvanie:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundy"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Vývojka:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Veľkosť súboru:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Aktuálny vývoj:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Pôvodné rozmery:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Výrobca fotoaparátu:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Model fotoaparátu:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Blesk:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Ohnisková vzdialenosť:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Dátum vytvorenia:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Čas vytvorenia:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Expozícia:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS zemepisná šírka:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS zemepisná dĺžka:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Umelec:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Autorské právo:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Softvér:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Rozšírené informácie"
 
@@ -5029,8 +5111,9 @@ msgid "Uploading %d of %d"
 msgstr "Odovzdáva sa %d z %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
+#, 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 "Uverejňovanie na %s nemôže pokračovať, pretože sa vyskytla chyba:"
 
 #: src/publishing/PublishingPluginHost.vala:84
@@ -5039,65 +5122,71 @@ msgstr ""
 "Aby ste mohli uverejniť vaše fotografie na inej službe, zvoľte si ju z "
 "ponuky hore."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Vybrané fotografie/videá boli úspešne uverejnené."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Vybrané videá boli úspešne uverejnené."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Zvolené fotografie boli úspešne uverejnené."
-
-#: 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
+#, fuzzy
+#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
-msgstr "Vybrané video bolo úspešne uverejnené."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Vybrané video bolo úspešne uverejnené."
+msgstr[1] "Vybrané video bolo úspešne uverejnené."
+msgstr[2] "Vybrané video bolo úspešne uverejnené."
 
-#: src/publishing/PublishingUI.vala:114
+#: src/publishing/PublishingUI.vala:109
+#, fuzzy
+#| msgid "The selected photo was successfully published."
 msgid "The selected photo was successfully published."
-msgstr "Vybraná fotografia bola úspešne uverejnená."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Vybraná fotografia bola úspešne uverejnená."
+msgstr[1] "Vybraná fotografia bola úspešne uverejnená."
+msgstr[2] "Vybraná fotografia bola úspešne uverejnená."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Vybrané fotografie/videá boli úspešne uverejnené."
 
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
+#: src/publishing/PublishingUI.vala:127
+#, fuzzy
+#| msgid "Fetching account information..."
+msgid "Fetching account information…"
 msgstr "Získavajú sa informácie o účte..."
 
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Prihlasuje sa..."
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Prihlasuje sa…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Uverejniť fotografie"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Uverejniť fotografie _na službe:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Uverejniť videá"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Uverejniť videá _na"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Uverejniť fotografie a videá"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Uverejniť fotografie a videá _na"
 
 #. 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 "Nepodarilo sa uverejniť"
 
-#: 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 "
@@ -5114,11 +5203,7 @@ msgstr ""
 msgid "Publishing"
 msgstr "Uverejňovanie"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Otočiť do_prava"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Otočiť"
 
@@ -5126,14 +5211,10 @@ msgstr "Otočiť"
 msgid "Rotate Right"
 msgstr "Otočiť 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čí fotografie doprava (stlačte Ctrl na otočenie doľava)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Otočiť doľa_va"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
@@ -5142,23 +5223,17 @@ msgstr "Otočiť doľava"
 msgid "Rotate the photos left"
 msgstr "Otočiť fotografie doľava"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Prevrátiť vodo_rovne"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Prevrátiť horizontálne"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Prevrátiť _zvislo"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Prevrátiť vertikálne"
 
-#: 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 programe"
 
@@ -5166,19 +5241,35 @@ msgstr "_O programe"
 msgid "_Apply"
 msgstr "_Použiť"
 
+#: 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 "_Upraviť"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "_Dopredu"
 
-#: 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 "Na _celú obrazovku"
 
+#: 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 "_Pomocník"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Opustiť režim _celej obrazovky"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Nová"
 
@@ -5186,15 +5277,9 @@ msgstr "_Nová"
 msgid "_Next"
 msgstr "Ď_alšia"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_OK"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Spustiť"
-
-#: 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 "_Nastavenia"
 
@@ -5202,11 +5287,9 @@ msgstr "_Nastavenia"
 msgid "_Previous"
 msgstr "_Predchádzajúca"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Tlačiť"
-
-#: 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čiť"
 
@@ -5246,23 +5329,25 @@ msgstr "_Normálna veľkosť"
 msgid "Best _Fit"
 msgstr "_Prispôsobiť"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "Vy_lepšiť"
+#: 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 "_Priblížiť"
+
+#: 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 "_Vzdialiť"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Vylepšiť"
 
 # tooltip
-#: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
 msgstr "Automaticky vylepší vzhľad fotografie"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Kopírovať úpravu farieb"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Kopírovať úpravu farieb"
@@ -5272,10 +5357,6 @@ msgstr "Kopírovať úpravu farieb"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Skopíruje úpravu farieb aplikovanú na fotografiu"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Vložiť úpravu farieb"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Vložiť úpravu farieb"
@@ -5285,7 +5366,7 @@ msgstr "Vložiť úpravu farieb"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Aplikuje skopírovanú úpravu farieb na vybranú fotografiu"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "O_rezať"
 
@@ -5295,7 +5376,7 @@ msgstr "Orezať"
 
 # tooltip
 #: src/Resources.vala:200
-msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Oreže veľkosť fotografie"
 
 #: src/Resources.vala:203
@@ -5307,7 +5388,7 @@ msgstr "Vyrovnať"
 msgid "Straighten the photo"
 msgstr "Vyrovná fotografiu"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "Červené _oči"
 
@@ -5320,7 +5401,7 @@ msgstr "Červené oči"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Zmierni alebo odstráni efekt červených očí vo fotografii"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Upraviť"
 
@@ -5330,13 +5411,11 @@ msgstr "Upraviť"
 
 # tooltip
 #: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+#, fuzzy
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Upraví farbu a tón fotografie"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "Vrátiť do _pôvodného stavu"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Vrátiť do pôvodného stavu"
@@ -5349,19 +5428,17 @@ msgstr "Vrátiť _externé úpravy"
 msgid "Revert to the master photo"
 msgstr "Vrátiť sa k pôvodnej fotografii"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Nastaviť ako _pozadie pracovnej plochy"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Nastaviť vybraný obrázok ako pozadie pracovnej plochy"
 
 #: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Nastaviť ako _prezentáciu pre pracovnú plochu..."
+msgid "Set as _Desktop Slideshow…"
+msgstr "Nastaviť ako prezentáciu _pracovnej plochy…"
 
-#: 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 "Vrátiť _späť"
 
@@ -5369,7 +5446,9 @@ msgstr "Vrátiť _späť"
 msgid "Undo"
 msgstr "Vrátiť späť"
 
-#: 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 "_Opakovať vrátené"
 
@@ -5377,11 +5456,12 @@ msgstr "_Opakovať vrátené"
 msgid "Redo"
 msgstr "Opakovať vrátené"
 
-#: src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "Pre_menovať udalosť..."
+#: 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 "Preme_novať udalosť…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Označiť ako _hlavnú fotografiu udalosti"
 
@@ -5389,7 +5469,7 @@ msgstr "Označiť ako _hlavnú fotografiu udalosti"
 msgid "Make Key Photo for Event"
 msgstr "Označiť ako hlavnú fotografiu udalosti"
 
-#: 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á udalosť"
 
@@ -5405,7 +5485,7 @@ msgstr "Presunúť fotografie"
 msgid "Move photos to an event"
 msgstr "Presunúť fotografie do udalosti"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Zlúčiť udalosti"
 
@@ -5417,7 +5497,8 @@ msgstr "Zlúčiť"
 msgid "Combine events into a single event"
 msgstr "Zlúčiť udalosti do jednej udalosti"
 
-#: 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 "O_hodnotiť"
 
@@ -5429,7 +5510,8 @@ msgstr "Ohodnotiť"
 msgid "Change the rating of your photo"
 msgstr "Zmeniť hodnotenie vašej 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ýšiť"
 
@@ -5437,7 +5519,8 @@ msgstr "Z_výšiť"
 msgid "Increase Rating"
 msgstr "Zvýšiť hodnotenie"
 
-#: 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 "_Znížiť"
 
@@ -5445,7 +5528,8 @@ msgstr "_Znížiť"
 msgid "Decrease Rating"
 msgstr "Znížiť hodnotenie"
 
-#: 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 "_Neohodnotená"
 
@@ -5465,7 +5549,8 @@ msgstr "Nastavuje sa ako neohodnotená"
 msgid "Remove any ratings"
 msgstr "Odstrániť všetky hodnotenia"
 
-#: 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 "_Odmietnutá"
 
@@ -5485,7 +5570,8 @@ msgstr "Nastavuje sa ako odmietnutá"
 msgid "Set rating to rejected"
 msgstr "Nastaviť hodnotenie ako odmietnuté"
 
-#: 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 "Len _odmietnuté"
 
@@ -5497,7 +5583,8 @@ msgstr "Len odmietnuté"
 msgid "Show only rejected photos"
 msgstr "Zobraziť len odmietnuté 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šetky + o_dmietnuté"
 
@@ -5506,7 +5593,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Zobrazí všetky fotografie, vrátane odmietnutý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šetky fotografie"
 
@@ -5516,15 +5604,19 @@ msgstr "_Všetky fotografie"
 msgid "Show all photos"
 msgstr "Zobraziť všetky 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 "_Hodnotenia"
 
 #: src/Resources.vala:280
-msgid "Display each photo's rating"
+#, fuzzy
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Zobraziť hodnotenie každej fotografie"
 
-#: 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 "_Filtrovať fotografie"
 
@@ -5536,10 +5628,6 @@ msgstr "Filtrovať fotografie"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Obmedziť počet zobrazených fotografií na základe filtra"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "Du_plikovať"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Duplikovať"
@@ -5549,24 +5637,26 @@ msgid "Make a duplicate of the photo"
 msgstr "Vytvoriť duplikát fotografie"
 
 #: src/Resources.vala:290
-msgid "_Export..."
-msgstr "_Exportovať..."
+msgid "_Export…"
+msgstr "_Exportovať…"
 
 #: src/Resources.vala:292
-msgid "_Print..."
-msgstr "_Tlačiť..."
+msgid "_Print…"
+msgstr "_Tlačiť…"
 
 #: src/Resources.vala:294
-msgid "Pu_blish..."
-msgstr "_Uverejniť..."
+msgid "Pu_blish…"
+msgstr "Uvere_jniť…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Uverejní na rôznych webových stránkach"
 
-#: src/Resources.vala:298
-msgid "Edit _Title..."
-msgstr "Upraviť _názov..."
+# DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251
+#: 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 "_Upraviť názov…"
 
 # DK:https://bugzilla.gnome.org/show_bug.cgi?id=744251
 #. Button label
@@ -5575,35 +5665,42 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Upraviť názov"
 
-#: src/Resources.vala:302
-msgid "Edit _Comment..."
-msgstr "Upraviť _komentár..."
+#: 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 "Upraviť _komentár…"
 
 #. Button label
 #: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Upraviť komentár"
 
-#: src/Resources.vala:306
-msgid "Edit Event _Comment..."
-msgstr "Upraviť komentár k _udalosti..."
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=736632
+#: src/Resources.vala:306 ui/event.ui:588
+msgid "Edit Event _Comment…"
+msgstr "Upraviť _komentár k udalosti…"
 
-#: src/Resources.vala:309
-msgid "_Adjust Date and Time..."
-msgstr "_Upraviť dátum a čas..."
+# window title
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+msgid "_Adjust Date and Time…"
+msgstr "_Upraviť dátum a čas…"
 
 # window title
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Upráva dátumu a času"
 
-#: src/Resources.vala:312
-msgid "Add _Tags..."
-msgstr "Pridať _značky..."
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255
+#: 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 "Pridať _značky…"
 
-#: src/Resources.vala:313
-msgid "_Add Tags..."
-msgstr "_Pridať značky..."
+# DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255
+#: src/Resources.vala:313 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr "_Pridať značky…"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255
 #. Dialog title
@@ -5612,31 +5709,22 @@ msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Pridanie značiek"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Otvoriť pomocou e_xterného editora"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Otvoriť pomocou RA_W editora"
-
-#: src/Resources.vala:323
-msgid "Send _To..."
-msgstr "Odoslať _do..."
-
-#: src/Resources.vala:324
-msgid "Send T_o..."
-msgstr "Odoslať d_o..."
+# dialog title
+#: src/Resources.vala:324 ui/photo_context.ui:133
+msgid "Send T_o…"
+msgstr "Odoslať _do…"
 
 #: src/Resources.vala:326
-msgid "_Find..."
-msgstr "_Nájsť..."
+msgid "_Find…"
+msgstr "_Nájsť…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Nájsť"
 
-#: 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 ""
 "Nájdite obrázok napísaním textu ktorý sa nachádza v jeho názve alebo značke"
@@ -5655,14 +5743,16 @@ msgid "Unable to launch editor: %s"
 msgstr "Nie je možné spustiť editor: %s"
 
 #: src/Resources.vala:340
-#, c-format
-msgid "Add Tag \"%s\""
+#, fuzzy, c-format
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Pridať značku „%s“"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
-#, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+#, fuzzy, c-format
+#| msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Pridať značky „%s“ a „%s“"
 
 # DK: https://bugzilla.gnome.org/show_bug.cgi?id=744255
@@ -5674,12 +5764,13 @@ msgstr "Pridanie značiek"
 
 #: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "O_dstrániť značku „%s“"
 
 #: src/Resources.vala:357
-#, c-format
-msgid "Delete Tag \"%s\""
+#, fuzzy, c-format
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "Odstrániť značku „%s“"
 
 #: src/Resources.vala:360
@@ -5688,21 +5779,24 @@ msgstr "Odstrániť značku"
 
 #: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "Pre_menovať značku „%s“..."
+msgid "Re_name Tag “%s”…"
+msgstr "Pre_menovať značku „%s“…"
 
 #: src/Resources.vala:370
-#, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+#, fuzzy, c-format
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "Premenovať značku „%s“ na „%s“"
 
-#: src/Resources.vala:373
-msgid "_Rename..."
-msgstr "_Premenovať..."
+#: src/Resources.vala:373 ui/tags.ui:454
+msgid "_Rename…"
+msgstr "_Premenovať…"
 
-#: src/Resources.vala:375
-msgid "Modif_y Tags..."
-msgstr "_Upraviť značky..."
+# dialog title
+#: 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 "Uprav_iť značky…"
 
 # dialog title
 #: src/Resources.vala:376
@@ -5710,167 +5804,175 @@ msgid "Modify Tags"
 msgstr "Úprava značiek"
 
 #: src/Resources.vala:379
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Označiť fotografie ako „%s“"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Označiť fotografie ako „%s“"
-
-#: src/Resources.vala:383
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Označiť vybrané fotografie ako „%s“"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Označiť vybrané fotografie ako „%s“"
-
-#: src/Resources.vala:388
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Odstrániť značku „%s“ z _fotografií"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Odstrániť značku „%s“ z _fotografií"
-
-#: src/Resources.vala:393
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Odstrániť značku „%s“ z fotografií"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Odstrániť značku „%s“ z fotografií"
-
-#: src/Resources.vala:398
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#, fuzzy, c-format
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Označiť fotografie ako „%s“"
+msgstr[1] "Označiť fotografie ako „%s“"
+msgstr[2] "Označiť fotografie ako „%s“"
+
+#: src/Resources.vala:385
+#, fuzzy, 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] "Označiť vybrané fotografie ako „%s“"
+msgstr[1] "Označiť vybrané fotografie ako „%s“"
+msgstr[2] "Označiť vybrané fotografie ako „%s“"
+
+#: src/Resources.vala:391
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Odstrániť značku „%s“ z _fotografií"
+msgstr[1] "Odstrániť značku „%s“ z _fotografií"
+msgstr[2] "Odstrániť značku „%s“ z _fotografií"
+
+#: src/Resources.vala:397
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Odstrániť značku „%s“ z fotografií"
+msgstr[1] "Odstrániť značku „%s“ z fotografií"
+msgstr[2] "Odstrániť značku „%s“ z fotografií"
+
+#: src/Resources.vala:403
+#, 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 "Nie je možné premenovať značku na „%s“, lebo táto značka už existuje."
 
-#: src/Resources.vala:402
-#, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#: src/Resources.vala:407
+#, 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 ""
 "Nepodarilo sa premenovať vyhľadávanie na „%s“, lebo takéto vyhľadávanie už "
 "existuje."
 
-#: src/Resources.vala:405
+#. Saved search button
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Uložené vyhľadávanie"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Odstrániť vyhľadávanie"
 
-#: src/Resources.vala:410
-msgid "_Edit..."
-msgstr "_Upraviť..."
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr "_Upraviť…"
 
-#: src/Resources.vala:411
-msgid "Re_name..."
-msgstr "_Premenovať..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr "_Premenovať…"
 
-#: src/Resources.vala:414
-#, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+#: src/Resources.vala:419
+#, fuzzy, c-format
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Premenovať vyhľadávanie „%s“ na „%s“"
 
-#: src/Resources.vala:418
-#, c-format
-msgid "Delete Search \"%s\""
+#: src/Resources.vala:423
+#, fuzzy, c-format
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "O_dstrániť vyhľadávanie „%s“"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Hodnotiť %s"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Nastaviť hodnotenie na %s"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Nastavuje sa hodnotenie na %s"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Zobraziť %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Zobraziť len fotografie s hodnotením %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s alebo lepšie"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Zobraziť %s alebo lepšie"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Zobraziť iba fotografie s hodnotením %s alebo lepšie"
 
 # tooltip
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Odstráni vybrané fotografie z koša"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Odstrániť vybrané fotografie z knižnice"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Obnoviť"
 
 # tooltip
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Presunie vybrané fotografie naspäť do knižnice"
 
-#: 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 "Zobraziť v správcovi sú_borov"
 
-#: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
+#, fuzzy
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Otvoriť priečinok zvolených fotografií v správcovi súborov"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nie je možné otvoriť v správcovi súborov: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "_Odstrániť z knižnice"
 
-#: 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 "Presunúť do _Koša"
 
-#: 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 "Ozn_ačiť všetko"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Vybrať všetky položky"
 
@@ -5878,39 +5980,46 @@ msgstr "Vybrať všetky položky"
 #. / 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:772
-msgid "%-I:%M %p"
-msgstr "%-H:%M"
-
 #. / 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:777
-msgid "%-I:%M:%S %p"
-msgstr "%-H:%M:%S"
-
 #. / 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:781
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %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
-#. / 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:786 src/Resources.vala:796
+#: src/Resources.vala:744
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
-msgstr "%a %d. %b"
+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:791
+#: src/Resources.vala:749
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
-msgstr "%d. %b, %Y"
+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:754
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+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:759
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a %e. %b, %Y"
 
 #: src/Screensaver.vala:18 src/SlideshowPage.vala:141
 msgid "Slideshow"
@@ -5921,139 +6030,139 @@ msgid "Saved Searches"
 msgstr "Uložené vyhľadávania"
 
 #. 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 presne"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "začína s"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "končí s"
 
-#: 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 "nie je nastavené"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "je nastavené"
 
 #. 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 "nie je"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "akákoľvek fotografia"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "RAW fotografia"
 
-#: 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 "obsahuje"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "neobsahuje"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "úpravy"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "interné úpravy"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "externé úpravy"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "označená"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "neoznačená"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "a vyššie"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "iba"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "a nižšie"
 
-#: 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 pred"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "je medzi"
 
-#: 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 "Hľadať"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: 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 "aspoň jedno"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "všetky"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "žiadne"
 
@@ -6093,8 +6202,8 @@ msgstr "Stav označenia"
 msgid "Photo state"
 msgstr "Stav fotografie"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:999
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Hodnotenie"
 
@@ -6102,21 +6211,32 @@ msgstr "Hodnotenie"
 msgid "Date"
 msgstr "Dátum"
 
-#: src/SearchFilter.vala:600 src/SearchFilter.vala:601
-msgid "Videos"
-msgstr "Videá"
+#: src/SearchFilter.vala:815
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "Hodnotenie ★+"
 
-#: src/SearchFilter.vala:606
-msgid "RAW Photos"
-msgstr "RAW fotografie"
+#: src/SearchFilter.vala:818
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "Hodnotenie ★★+"
 
-#: src/SearchFilter.vala:607
-msgid "RAW photos"
-msgstr "RAW fotografie"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "Hodnotenie ★★★+"
 
-#: src/SearchFilter.vala:948
-#, c-format
-msgid "Error loading UI file %s: %s"
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "Hodnotenie ★★★★+"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "Hodnotenie ★★★★★+"
+
+#: src/SearchFilter.vala:1064
+#, fuzzy, c-format
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
 msgstr "Chyba pri nahrávaní súboru používateľského rozhrania %s: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
@@ -6124,18 +6244,27 @@ msgstr "Chyba pri nahrávaní súboru používateľského rozhrania %s: %s"
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:959
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Zavrieť"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:965
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Typ"
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Nová _značka"
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Videá"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW fotografie"
+
+#: src/SearchFilter.vala:1125
+msgid "Use a saved search to filter items in the current view"
+msgstr ""
+"Použiť uložené vyhľadávanie na filtrovanie položiek v aktuálnom zobrazení"
 
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
@@ -6204,203 +6333,627 @@ msgstr "Náhodná"
 msgid "Tags"
 msgstr "Značky"
 
-#: src/Tag.vala:817
+#: src/Tag.vala:830
 msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:507
 msgid "Export Videos"
 msgstr "Exportovať videá"
 
-#: ui/set_background_dialog.ui:15
+#: 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 "Prepnúť _značku"
+
+#: 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ývojár"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "Otvoriť pomocou e_xterného editora"
+
+#: 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 "Zobraziť u_dalosť fotografie"
+
+#: 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 "_Súbor"
+
+#: 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žiť _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 "_Zobraziť"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Prispôsobiť _strane"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Mierka _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Mierka _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Fotografia"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Predchádzajúca fotografia"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "Ďa_lšia fotografia"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "Nás_troje"
+
+#: 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 "Často _kladené otázky"
+
+#: 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ásiť 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 "_Importovať z priečinka…"
+
+#: 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 "Importovať z _aplikácie…"
+
+#: 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 "_Vyprázdniť kôš"
+
+#: 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 "_Nájsť"
+
+#: 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é vyhľadávanie…"
+
+#: 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é informácie"
+
+#: 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šírené informácie"
+
+#: 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 "_Panel vyhľadávania"
+
+#: 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 "Bočný 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 "Panel _nástrojov"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "Komentár"
+
+#: 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 "Zora_diť udalosti"
+
+#: 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 "Vz_ostupne"
+
+#: 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 "Zo_stupne"
+
+#: 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 "U_dalosti"
+
+#: 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 "_Odstrániť z knižnice"
+
+#: 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 "_Značky"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Usporiadať _fotografie"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Podľa _názvu"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Podľa názvu _súboru"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Podľa _dátumu vytvorenie"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Podľa  _hodnotenia"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "Zo_stupne"
+
+#: 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 "_Zastaviť importovanie"
+
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Nastaviť ako _pozadie pracovnej plochy"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Použiť pre pracovnú plochu"
 
 # GtkCheckButton
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Použiť pre uzamykaciu obrazovku"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Nastaviť ako prezentáciu pre pracovnú plochu"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Vygenerovať prezentáciu pre pracovnú plochu"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Ukázať každú fotografiu na"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "určitý čas"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Vygenerovať prezentáciu pre pracovnú plochu"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Ako dlho bude každá fotografia zobrazená na pozadí pracovnej plochy"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Názov vyhľadávania:"
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "biela"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Zhoda"
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "čierna"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "z nasledujúcich:"
+#: ui/shotwell.ui:123
+msgid "Display"
+msgstr "Obrazovka"
+
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "_Pozadie:"
+
+#: ui/shotwell.ui:175
+msgid "_Import photos to:"
+msgstr "_Importovať fotografie do:"
+
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Sledovať adresáre knižnice kvôli novým súborom"
+
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "Importuje sa..."
+
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "Š_truktúra priečinkov:"
+
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "Príklad:"
+
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "Zmeniť názov importovaných súborov na _malé písmená"
+
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "metaúdaje"
+
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "_Zapísať značky, názvy a ďalšie metaúdaje do súborov fotografií"
+
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "RAW vývojka"
+
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "Pred_volená:"
+
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Vzorec:"
+
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "_Externý editor fotografií:"
+
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "Externý _RAW editor:"
+
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "Externé editory"
+
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "Zásuvné moduly"
 
-#: ui/shotwell.ui:195
+#: ui/shotwell.ui:583
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Veľkosť tlačeného obrázku</b>"
 
-#: ui/shotwell.ui:212
+#: ui/shotwell.ui:600
 msgid "Use a _standard size:"
 msgstr "Použiť š_tandardnú veľkosť:"
 
-#: ui/shotwell.ui:255
+#: ui/shotwell.ui:643
 msgid "Use a c_ustom size:"
 msgstr "Použiť _vlastnú veľkosť:"
 
-#: ui/shotwell.ui:345
+#: ui/shotwell.ui:731
 msgid "_Match photo aspect ratio"
 msgstr "_Zachovať pomer strán fotografie"
 
-#: ui/shotwell.ui:369
+#: ui/shotwell.ui:755
 msgid "_Autosize:"
 msgstr "_Automatická veľkosť:"
 
-#: ui/shotwell.ui:409
+#: ui/shotwell.ui:795
 msgid "<b>Titles</b>"
 msgstr "<b>Názvy</b>"
 
-#: ui/shotwell.ui:426
+#: ui/shotwell.ui:812
 msgid "Print image _title"
 msgstr "Vytlačiť _názov obrázku"
 
-#: ui/shotwell.ui:470
+#: ui/shotwell.ui:855
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rozlíšenie pixelov</b>"
 
-#: ui/shotwell.ui:490
+#: ui/shotwell.ui:875
 msgid "_Output photo at:"
 msgstr "_Vytvoriť fotografiu v:"
 
-#: ui/shotwell.ui:525
+#: ui/shotwell.ui:909
 msgid "pixels per inch"
 msgstr "pixeloch na palec"
 
-#: ui/shotwell.ui:559
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "_Názov vyhľadávania:"
+
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "_Zhoda"
+
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "z nasledujúcich:"
+
+#: ui/shotwell.ui:1111
 msgid "label"
 msgstr "štítok"
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Nastavenia programu Shotwell"
+#: ui/shotwell.ui:1262
+msgid "_Delay:"
+msgstr "_Oneskorenie:"
 
-#: ui/shotwell.ui:730
-msgid "white"
-msgstr "biela"
+#: ui/shotwell.ui:1276
+msgid "_Transition effect:"
+msgstr "_Efekt prechodu:"
 
-#: ui/shotwell.ui:757
-msgid "black"
-msgstr "čierna"
+#: ui/shotwell.ui:1290
+msgid "Transition d_elay:"
+msgstr "Oneskorenie _prechodu:"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Sledovať adresáre knižnice kvôli novým súborom"
+#: ui/shotwell.ui:1300
+msgid "Show t_itle"
+msgstr "Zobraziť ná_zov"
 
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "metaúdaje"
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+msgid "seconds"
+msgstr "sekúnd"
 
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "_Zapísať značky, názvy a ďalšie metaúdaje do súborov fotografií"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nová _značka…"
 
-#: ui/shotwell.ui:880
-msgid "Display"
-msgstr "Obrazovka"
+# tooltip
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Odstráni všetky fotografie v koši"
 
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
-msgstr "_Importovať fotografie do:"
+#~ msgid "Login"
+#~ msgstr "Prihlásiť sa"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Pozadie:"
+#~ msgid "_Contents"
+#~ msgstr "Ob_sah"
 
-#: ui/shotwell.ui:947
-msgid "Importing"
-msgstr "Importuje sa..."
+#~ msgid "Display the title of each photo"
+#~ msgstr "Zobraziť názov každej fotografie"
 
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
-msgstr "Š_truktúra priečinkov:"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Importovať vybrané fotografie do vašej knižnice"
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Vzorec:"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Importovať všetky fotografie do vašej knižnice"
 
-#: ui/shotwell.ui:1091
-msgid "Example:"
-msgstr "Príklad:"
+#~ msgid "Play a slideshow"
+#~ msgstr "Spustiť prezentáciu"
 
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
-msgstr "Zmeniť názov importovaných súborov na _malé písmená"
+#~ msgid "Save Details..."
+#~ msgstr "Uložiť podrobnosti..."
 
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
-msgstr "RAW vývojka"
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Zmeniť pôvodné súbory fotiek"
 
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
-msgstr "Pred_volená:"
+#~ msgid "_Modify original files"
+#~ msgstr "_Zmeniť pôvodné súbory"
 
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
-msgstr "_Externý editor fotografií:"
+#~ msgid "Save photo"
+#~ msgstr "Uložiť fotografiu"
 
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
-msgstr "Externý _RAW editor:"
+#~ msgid "Save _As..."
+#~ msgstr "Uložiť _ako..."
 
-#: ui/shotwell.ui:1307
-msgid "External Editors"
-msgstr "Externé editory"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Uložiť fotografiu pod novým názvom"
 
-#: ui/shotwell.ui:1334
-msgid "Plugins"
-msgstr "Zásuvné moduly"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Vytlačiť fotografiu na tlačiarni pripojenej k vášmu počítaču"
 
-#: ui/shotwell.ui:1400
-msgid "_Delay:"
-msgstr "_Oneskorenie:"
+#~ msgid "Previous Photo"
+#~ msgstr "Predchádzajúca fotografia"
 
-#: ui/shotwell.ui:1416
-msgid "_Transition effect:"
-msgstr "_Efekt prechodu:"
+#~ msgid "Next Photo"
+#~ msgstr "Ďalšia fotografia"
 
-#: ui/shotwell.ui:1432
-msgid "Transition d_elay:"
-msgstr "Oneskorenie _prechodu:"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Zvýšiť zväčšenie fotografie"
 
-#: ui/shotwell.ui:1444
-msgid "Show t_itle"
-msgstr "Zobraziť ná_zov"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Zmenšiť zväčšenie fotografie"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
-msgid "seconds"
-msgstr "sekúnd"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Zväčšiť fotografiu na veľkosť obrazovky"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Priblížiť fotografiu na 100% zväčšenie"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Priblížiť fotografiu na 200% zväčšenie"
+
+# tooltip
+#~ msgid "Display the comment of each event"
+#~ msgstr "Zobrazí komentár ku každej udalosti"
+
+#~ msgid "Importing..."
+#~ msgstr "Importuje sa..."
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Zastaviť importovanie fotografií"
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Pripravuje sa importovanie..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Importovať z priečinka..."
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Importovať fotografie z disku do knižnice"
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Importovať z _aplikácie..."
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Nájsť fotografie a videá podľa kritérií hľadania"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Zobraziť základné informácie pre výber"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Zobraziť rozšírené informácie pre výber"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Zobrazí panel vyhľadávania"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Zobraz bočný panel"
+
+# tooltip
+#~ msgid "Display the tool bar"
+#~ msgstr "Zobrazí panel nástrojov"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Usporiadať fotografie vo vzostupnom poradí"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Usporiadať fotografie v zostupnom poradí"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Zvýšiť zväčšenie nadhľadov"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Zmenšiť zväčšenie nadhľadov"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Prehrať video"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Otvoriť vybrané videá v systémovom prehrávači videa"
+
+# tooltip
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Zobrazí komentár ku každej fotografii"
+
+#~ msgid "Display each photo's tags"
+#~ msgstr "Zobraziť značky každej fotografie"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Usporiadať fotografie podľa názvu"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Usporiadať fotografie podľa dátumu vytvorenia"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Usporiadať fotografie podľa hodnotenia"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Usporiada fotografie podľa názvu súboru"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Vybrané videá boli úspešne uverejnené."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Zvolené fotografie boli úspešne uverejnené."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Nastaviť ako _prezentáciu pre pracovnú plochu..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "Pre_menovať udalosť..."
+
+#~ msgid "_Export..."
+#~ msgstr "_Exportovať..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Tlačiť..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "_Uverejniť..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Upraviť _názov..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Upraviť _komentár..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Upraviť komentár k _udalosti..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Upraviť dátum a čas..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Pridať _značky..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "_Pridať značky..."
+
+#~ msgid "Send _To..."
+#~ msgstr "Odoslať _do..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Odoslať d_o..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Nájsť..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "_Upraviť značky..."
+
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Označiť fotografie ako „%s“"
+
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Označiť vybrané fotografie ako „%s“"
+
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Odstrániť značku „%s“ z _fotografií"
+
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Odstrániť značku „%s“ z fotografií"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Upraviť..."
+
+#~ msgid "RAW photos"
+#~ msgstr "RAW fotografie"
+
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Nastavenia programu Shotwell"
+
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-H:%M"
+
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-H:%M:%S"
 
 #~ msgid "Intro message replaced at runtime"
 #~ msgstr "Úvodná správa nahradená pri spustení"
@@ -6414,9 +6967,6 @@ msgstr "sekúnd"
 #~ msgid "$mediatype will appear in"
 #~ msgstr "Videá sa zobrazia v:"
 
-#~ msgid "No photos/videos found"
-#~ msgstr "Neboli nájdené žiadne fotografie/videá"
-
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Autorské práva 2009-2015 Nadácia Yorba"
 
diff --git a/po/sr.gmo b/po/sr.gmo
index 7a58f49..72bd351 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 1accfbe..13a2f2f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -83,9 +83,8 @@ 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 "фото-бунар"
+msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
 #| msgid "Photo Viewer"
diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo
index 8419aac..d1495d4 100644
--- a/po/sr@latin.gmo
+++ b/po/sr@latin.gmo
diff --git a/po/sr@latin.po b/po/sr@latin.po
index ce53b58..7082049 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -83,9 +83,8 @@ 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 "foto-bunar"
+msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
 #| msgid "Photo Viewer"
diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index 4b84aa5..43ec28c 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.32.1, the Vala compiler
+/* _CameraInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _CameraInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
index d7eb0e4..f9b89f0 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.32.1, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _ConfigInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
index f95207a..c2abfec 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.32.1, the Vala compiler
+/* _CoreInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _CoreInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
index 2d2fc94..f43d488 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _DataImportsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
index 47e29a8..2038397 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DbInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _DbInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 2095fcb..287b158 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DirectInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _DirectInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
index 148e461..1ef3c0d 100644
--- a/src/.unitize/_Direct_unitize_entry.c
+++ b/src/.unitize/_Direct_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Direct_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.34.4, the Vala compiler
  * generated from _Direct_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
index 5f351af..8b052de 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _EditingToolsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
index 33088f7..3ae2e86 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _EventsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _EventsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index 1a3988e..696ae50 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.32.1, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _FoldersInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index 6d70073..4a6d4ef 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.32.1, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _LibraryInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
index 8e7246c..8f86bb1 100644
--- a/src/.unitize/_Library_unitize_entry.c
+++ b/src/.unitize/_Library_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Library_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.34.4, the Vala compiler
  * generated from _Library_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
index 3710e7b..793acc8 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _PhotosInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
index 9a9ee42..64ca182 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _PluginsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
index b1d0861..745bf59 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _PublishingInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
index 7b0f7e8..7af4ca2 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _SearchesInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
index f312282..309f5e9 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _SidebarInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
index 31b8124..f456df8 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _SlideshowInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
index 599fb26..663c289 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _TagsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _TagsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
index 69712a7..8b4682f 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _ThreadsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index 102107b..e79a416 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.32.1, the Vala compiler
+/* _UnitInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _UnitInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
index ddfb022..2656134 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.32.1, the Vala compiler
+/* _UtilInternals.c generated by valac 0.34.4, the Vala compiler
  * generated from _UtilInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/AppDirs.c b/src/AppDirs.c
index c120815..7ac7928 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -1,4 +1,4 @@
-/* AppDirs.c generated by valac 0.32.1, the Vala compiler
+/* AppDirs.c generated by valac 0.34.4, the Vala compiler
  * generated from AppDirs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch440_g_error;
+				goto __catch442_g_error;
 			}
 		}
-		goto __finally440;
-		__catch440_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"
 		}
-		__finally440:
+		__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 __catch441_g_error;
+			goto __catch443_g_error;
 		}
 	}
-	goto __finally441;
-	__catch441_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"
 	}
-	__finally441:
+	__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 __catch442_g_error;
+				goto __catch444_g_error;
 			}
 		}
-		goto __finally442;
-		__catch442_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"
 		}
-		__finally442:
+		__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 __catch443_g_error;
+				goto __catch445_g_error;
 			}
 		}
-		goto __finally443;
-		__catch443_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"
 		}
-		__finally443:
+		__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 __catch444_g_error;
+				goto __catch446_g_error;
 			}
 		}
 	}
-	goto __finally444;
-	__catch444_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"
 	}
-	__finally444:
+	__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 __catch445_g_error;
+				goto __catch447_g_error;
 			}
 		}
 	}
-	goto __finally445;
-	__catch445_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"
 	}
-	__finally445:
+	__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 __catch446_g_error;
+					goto __catch448_g_error;
 				}
 			}
 		}
-		goto __finally446;
-		__catch446_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"
 		}
-		__finally446:
+		__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 __catch447_g_error;
+				goto __catch449_g_error;
 			}
 		}
 	}
-	goto __finally447;
-	__catch447_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"
 	}
-	__finally447:
+	__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 __catch448_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 __catch448_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 __finally448;
-		__catch448_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"
 		}
-		__finally448:
+		__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 __catch449_g_error;
+				goto __catch451_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_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"
 	}
-	__finally449:
+	__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 e49d245..b36bbbe 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.32.1, the Vala compiler
+/* AppWindow.c generated by valac 0.34.4, the Vala compiler
  * generated from AppWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -353,9 +353,9 @@ 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);
+void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_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;
@@ -622,57 +622,55 @@ static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (Slidesh
 FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	FullscreenWindow * self = NULL;
 	Page* _tmp0_ = NULL;
+#line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	static const gchar* accels[] = {"F11", NULL};
+#line 600 "AppWindow.c"
 	AppWindow* _tmp1_ = NULL;
 	AppWindow* _tmp2_ = NULL;
-#line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	static const gchar* accels[] = {"F11"};
-#line 602 "AppWindow.c"
-	AppWindow* _tmp3_ = NULL;
-	AppWindow* _tmp4_ = NULL;
-	GdkScreen* _tmp5_ = NULL;
+	GdkScreen* _tmp3_ = NULL;
 	GdkRectangle monitor = {0};
-	GdkRectangle _tmp6_ = {0};
+	GdkRectangle _tmp4_ = {0};
+	GdkRectangle _tmp5_ = {0};
+	gint _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;
+	ConfigFacade* _tmp9_ = NULL;
+	ConfigFacade* _tmp10_ = NULL;
+	gboolean _tmp11_ = FALSE;
+	GtkToggleToolButton* _tmp12_ = NULL;
+	GtkToggleToolButton* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	GtkToggleToolButton* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
 	GtkToggleToolButton* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
+	gboolean _tmp18_ = FALSE;
 	GtkToggleToolButton* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GtkToggleToolButton* _tmp21_ = NULL;
-	GtkToolButton* _tmp22_ = NULL;
+	GtkToolButton* _tmp20_ = NULL;
+	GtkToolButton* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
 	GtkToolButton* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GtkToolButton* _tmp25_ = NULL;
-	Page* _tmp26_ = NULL;
+	Page* _tmp24_ = NULL;
+	GtkToolbar* _tmp25_ = NULL;
+	GtkToolbar* _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;
-	GtkOverlay* _tmp41_ = NULL;
+	Page* _tmp31_ = NULL;
+	Page* _tmp35_ = NULL;
+	Page* _tmp36_ = NULL;
+	GtkToolbar* _tmp37_ = NULL;
+	GtkToolButton* _tmp38_ = NULL;
+	GtkOverlay* _tmp39_ = NULL;
+	GtkOverlay* _tmp40_ = NULL;
+	Page* _tmp41_ = NULL;
 	GtkOverlay* _tmp42_ = NULL;
-	Page* _tmp43_ = NULL;
-	GtkOverlay* _tmp44_ = NULL;
-	GtkToolbar* _tmp45_ = NULL;
+	GtkToolbar* _tmp43_ = NULL;
+	GdkRectangle _tmp44_ = {0};
+	gint _tmp45_ = 0;
 	GdkRectangle _tmp46_ = {0};
 	gint _tmp47_ = 0;
-	GdkRectangle _tmp48_ = {0};
-	gint _tmp49_ = 0;
-	Page* _tmp50_ = NULL;
+	Page* _tmp48_ = NULL;
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
 #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -682,181 +680,175 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 #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 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_);
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), FULLSCREEN_WINDOW_entries, G_N_ELEMENTS (FULLSCREEN_WINDOW_entries), self);
 #line 33 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	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 ();
+	_tmp1_ = app_window_get_instance ();
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
+	_tmp3_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
+	gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen_window_get_monitor_geometry (self, &_tmp6_);
+	fullscreen_window_get_monitor_geometry (self, &_tmp4_);
 #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	monitor = _tmp6_;
+	monitor = _tmp4_;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_ = monitor;
+	_tmp5_ = monitor;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8_ = _tmp7_.x;
+	_tmp6_ = _tmp5_.x;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp9_ = monitor;
+	_tmp7_ = monitor;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_ = _tmp9_.y;
+	_tmp8_ = _tmp7_.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_);
+	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_, _tmp8_);
 #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 ();
+	_tmp9_ = config_facade_get_instance ();
 #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = _tmp11_;
+	_tmp10_ = _tmp9_;
 #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));
+	_tmp11_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->is_toolbar_dismissal_enabled = _tmp13_;
+	self->priv->is_toolbar_dismissal_enabled = _tmp11_;
 #line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp10_);
 #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_ = self->priv->pin_button;
+	_tmp12_ = self->priv->pin_button;
 #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar");
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar");
 #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = self->priv->pin_button;
+	_tmp13_ = self->priv->pin_button;
 #line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = _ ("Pin Toolbar");
+	_tmp14_ = _ ("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_);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_button_get_type (), GtkToolButton), _tmp14_);
 #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = self->priv->pin_button;
+	_tmp15_ = self->priv->pin_button;
 #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = _ ("Pin the toolbar open");
+	_tmp16_ = _ ("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_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), _tmp16_);
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = self->priv->pin_button;
+	_tmp17_ = self->priv->pin_button;
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20_ = self->priv->is_toolbar_dismissal_enabled;
+	_tmp18_ = self->priv->is_toolbar_dismissal_enabled;
 #line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toggle_tool_button_set_active (_tmp19_, !_tmp20_);
+	gtk_toggle_tool_button_set_active (_tmp17_, !_tmp18_);
 #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp21_ = self->priv->pin_button;
+	_tmp19_ = 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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, 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;
+	_tmp20_ = self->priv->close_button;
 #line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_icon_name (_tmp22_, "view-restore");
+	gtk_tool_button_set_icon_name (_tmp20_, "view-restore");
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp23_ = self->priv->close_button;
+	_tmp21_ = self->priv->close_button;
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp24_ = _ ("Leave fullscreen");
+	_tmp22_ = _ ("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_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_ = self->priv->close_button;
+	_tmp23_ = self->priv->close_button;
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp26_ = page;
+	_tmp24_ = page;
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp27_ = page_get_toolbar (_tmp26_);
+	_tmp25_ = page_get_toolbar (_tmp24_);
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->toolbar);
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->toolbar = _tmp27_;
+	self->priv->toolbar = _tmp25_;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_ = self->priv->toolbar;
+	_tmp26_ = self->priv->toolbar;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toolbar_set_show_arrow (_tmp28_, FALSE);
+	gtk_toolbar_set_show_arrow (_tmp26_, FALSE);
 #line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29_ = self->priv->toolbar;
+	_tmp27_ = 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);
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp30_ = self->priv->toolbar;
+	_tmp28_ = self->priv->toolbar;
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_ = self->priv->toolbar;
+	_tmp29_ = self->priv->toolbar;
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
+	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp32_ = self->priv->toolbar;
+	_tmp30_ = self->priv->toolbar;
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
+	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp33_ = page;
+	_tmp31_ = page;
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, TYPE_SLIDESHOW_PAGE)) {
-#line 775 "AppWindow.c"
-		Page* _tmp34_ = NULL;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, TYPE_SLIDESHOW_PAGE)) {
+#line 767 "AppWindow.c"
+		Page* _tmp32_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp34_ = page;
+		_tmp32_ = page;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		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 781 "AppWindow.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
+#line 773 "AppWindow.c"
 	} else {
-		GtkToolbar* _tmp35_ = NULL;
-		GtkToggleToolButton* _tmp36_ = NULL;
+		GtkToolbar* _tmp33_ = NULL;
+		GtkToggleToolButton* _tmp34_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp35_ = self->priv->toolbar;
+		_tmp33_ = self->priv->toolbar;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp36_ = self->priv->pin_button;
+		_tmp34_ = 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 791 "AppWindow.c"
+		gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 783 "AppWindow.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp37_ = page;
+	_tmp35_ = page;
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_set_cursor_hide_time (_tmp37_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
+	page_set_cursor_hide_time (_tmp35_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp38_ = page;
+	_tmp36_ = page;
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_start_cursor_hiding (_tmp38_);
+	page_start_cursor_hiding (_tmp36_);
 #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp39_ = self->priv->toolbar;
+	_tmp37_ = self->priv->toolbar;
 #line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp40_ = self->priv->close_button;
+	_tmp38_ = 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);
+	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp41_ = self->priv->overlay;
+	_tmp39_ = 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));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
 #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp42_ = self->priv->overlay;
+	_tmp40_ = self->priv->overlay;
 #line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp43_ = page;
+	_tmp41_ = 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));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp44_ = self->priv->overlay;
+	_tmp42_ = self->priv->overlay;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp45_ = self->priv->toolbar;
+	_tmp43_ = self->priv->toolbar;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_overlay_add_overlay (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+	gtk_overlay_add_overlay (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp46_ = monitor;
+	_tmp44_ = monitor;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp47_ = _tmp46_.width;
+	_tmp45_ = _tmp44_.width;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp48_ = monitor;
+	_tmp46_ = monitor;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp49_ = _tmp48_.height;
+	_tmp47_ = _tmp46_.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_);
+	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp45_, _tmp47_);
 #line 86 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 87 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -866,21 +858,21 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 #line 93 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
 #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp50_ = page;
+	_tmp48_ = 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));
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, 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 849 "AppWindow.c"
+#line 841 "AppWindow.c"
 }
 
 
 FullscreenWindow* fullscreen_window_new (Page* page) {
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page);
-#line 856 "AppWindow.c"
+#line 848 "AppWindow.c"
 }
 
 
@@ -889,7 +881,7 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 865 "AppWindow.c"
+#line 857 "AppWindow.c"
 }
 
 
@@ -904,7 +896,7 @@ void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
 	_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
 #line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 880 "AppWindow.c"
+#line 872 "AppWindow.c"
 }
 
 
@@ -941,7 +933,7 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
 	*result = monitor;
 #line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 917 "AppWindow.c"
+#line 909 "AppWindow.c"
 }
 
 
@@ -966,7 +958,7 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	_tmp2_ = self->priv->switched_to;
 #line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 942 "AppWindow.c"
+#line 934 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -979,13 +971,13 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 		_g_object_unref0 (_tmp4_);
 #line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->switched_to = TRUE;
-#line 955 "AppWindow.c"
+#line 947 "AppWindow.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _result_;
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 961 "AppWindow.c"
+#line 953 "AppWindow.c"
 }
 
 
@@ -1019,11 +1011,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 995 "AppWindow.c"
+#line 987 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 999 "AppWindow.c"
+#line 991 "AppWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1032,11 +1024,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		_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 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 1008 "AppWindow.c"
+#line 1000 "AppWindow.c"
 	} else {
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = FALSE;
-#line 1012 "AppWindow.c"
+#line 1004 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_) {
@@ -1044,7 +1036,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1020 "AppWindow.c"
+#line 1012 "AppWindow.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = app_window_get_instance ();
@@ -1062,7 +1054,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 	result = _tmp10_;
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1038 "AppWindow.c"
+#line 1030 "AppWindow.c"
 }
 
 
@@ -1094,7 +1086,7 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
 	app_window_end_fullscreen (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1070 "AppWindow.c"
+#line 1062 "AppWindow.c"
 }
 
 
@@ -1103,7 +1095,7 @@ void fullscreen_window_close (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 1079 "AppWindow.c"
+#line 1071 "AppWindow.c"
 }
 
 
@@ -1124,7 +1116,7 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 	_tmp1_ = page;
 #line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1100 "AppWindow.c"
+#line 1092 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1135,13 +1127,13 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 		_tmp3_ = page;
 #line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_from (_tmp3_);
-#line 1111 "AppWindow.c"
+#line 1103 "AppWindow.c"
 	}
 #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 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 1117 "AppWindow.c"
+#line 1109 "AppWindow.c"
 }
 
 
@@ -1168,7 +1160,7 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
 	result = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1144 "AppWindow.c"
+#line 1136 "AppWindow.c"
 }
 
 
@@ -1177,7 +1169,7 @@ static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpo
 	result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
 #line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1153 "AppWindow.c"
+#line 1145 "AppWindow.c"
 }
 
 
@@ -1194,24 +1186,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 	_tmp0_ = self->priv->is_toolbar_shown;
 #line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 1170 "AppWindow.c"
+#line 1162 "AppWindow.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->waiting_for_invoke;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (!_tmp2_) {
-#line 1177 "AppWindow.c"
+#line 1169 "AppWindow.c"
 			gboolean _tmp3_ = FALSE;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = _tmp3_;
-#line 1183 "AppWindow.c"
+#line 1175 "AppWindow.c"
 		} else {
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = FALSE;
-#line 1187 "AppWindow.c"
+#line 1179 "AppWindow.c"
 		}
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp1_) {
@@ -1219,12 +1211,12 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 			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 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			self->priv->waiting_for_invoke = TRUE;
-#line 1195 "AppWindow.c"
+#line 1187 "AppWindow.c"
 		}
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1200 "AppWindow.c"
+#line 1192 "AppWindow.c"
 		GdkEventMotion* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1233,24 +1225,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 		_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 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 1209 "AppWindow.c"
+#line 1201 "AppWindow.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 1213 "AppWindow.c"
+#line 1205 "AppWindow.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1219 "AppWindow.c"
+#line 1211 "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 1226 "AppWindow.c"
+#line 1218 "AppWindow.c"
 }
 
 
@@ -1293,7 +1285,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 		_g_object_unref0 (devmgr);
 #line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1269 "AppWindow.c"
+#line 1261 "AppWindow.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = devmgr;
@@ -1321,7 +1313,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 	_g_object_unref0 (devmgr);
 #line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1297 "AppWindow.c"
+#line 1289 "AppWindow.c"
 }
 
 
@@ -1341,7 +1333,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1317 "AppWindow.c"
+#line 1309 "AppWindow.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1351,7 +1343,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1327 "AppWindow.c"
+#line 1319 "AppWindow.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
@@ -1359,7 +1351,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 	result = FALSE;
 #line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1335 "AppWindow.c"
+#line 1327 "AppWindow.c"
 }
 
 
@@ -1368,7 +1360,7 @@ static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpoi
 	result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
 #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1344 "AppWindow.c"
+#line 1336 "AppWindow.c"
 }
 
 
@@ -1384,7 +1376,7 @@ static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
 	self->priv->is_toolbar_shown = TRUE;
 #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 1360 "AppWindow.c"
+#line 1352 "AppWindow.c"
 }
 
 
@@ -1410,7 +1402,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = FALSE;
 #line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1386 "AppWindow.c"
+#line 1378 "AppWindow.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
@@ -1420,7 +1412,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1396 "AppWindow.c"
+#line 1388 "AppWindow.c"
 	}
 #line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1432,13 +1424,13 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1408 "AppWindow.c"
+#line 1400 "AppWindow.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = self->priv->left_toolbar_time;
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 1414 "AppWindow.c"
+#line 1406 "AppWindow.c"
 		time_t _tmp4_ = 0;
 #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = time (NULL);
@@ -1448,7 +1440,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1424 "AppWindow.c"
+#line 1416 "AppWindow.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = time (NULL);
@@ -1470,7 +1462,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1446 "AppWindow.c"
+#line 1438 "AppWindow.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
@@ -1478,7 +1470,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 	result = FALSE;
 #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1454 "AppWindow.c"
+#line 1446 "AppWindow.c"
 }
 
 
@@ -1492,7 +1484,7 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
 #line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = FALSE;
-#line 1468 "AppWindow.c"
+#line 1460 "AppWindow.c"
 }
 
 
@@ -1513,7 +1505,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 1489 "AppWindow.c"
+#line 1481 "AppWindow.c"
 }
 
 
@@ -1551,7 +1543,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 1527 "AppWindow.c"
+#line 1519 "AppWindow.c"
 }
 
 
@@ -1569,7 +1561,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 1545 "AppWindow.c"
+#line 1537 "AppWindow.c"
 }
 
 
@@ -1590,7 +1582,7 @@ static void page_window_real_switched_pages (PageWindow* self, Page* old_page, P
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1566 "AppWindow.c"
+#line 1558 "AppWindow.c"
 }
 
 
@@ -1599,7 +1591,7 @@ void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_pag
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1575 "AppWindow.c"
+#line 1567 "AppWindow.c"
 }
 
 
@@ -1629,7 +1621,7 @@ PageWindow* page_window_construct (GType object_type) {
 	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 1605 "AppWindow.c"
+#line 1597 "AppWindow.c"
 }
 
 
@@ -1647,7 +1639,7 @@ Page* page_window_get_current_page (PageWindow* self) {
 	result = _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1623 "AppWindow.c"
+#line 1615 "AppWindow.c"
 }
 
 
@@ -1666,13 +1658,13 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	_tmp0_ = self->priv->current_page;
 #line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1642 "AppWindow.c"
+#line 1634 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1648 "AppWindow.c"
+#line 1640 "AppWindow.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1698,7 +1690,7 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	page_window_switched_pages (self, old_page, _tmp7_);
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1674 "AppWindow.c"
+#line 1666 "AppWindow.c"
 }
 
 
@@ -1707,7 +1699,7 @@ void page_window_set_current_page (PageWindow* self, Page* page) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1683 "AppWindow.c"
+#line 1675 "AppWindow.c"
 }
 
 
@@ -1720,13 +1712,13 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	_tmp0_ = self->priv->current_page;
 #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1696 "AppWindow.c"
+#line 1688 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1702 "AppWindow.c"
+#line 1694 "AppWindow.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1742,7 +1734,7 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	page_window_switched_pages (self, old_page, NULL);
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1718 "AppWindow.c"
+#line 1710 "AppWindow.c"
 }
 
 
@@ -1751,7 +1743,7 @@ void page_window_clear_current_page (PageWindow* self) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1727 "AppWindow.c"
+#line 1719 "AppWindow.c"
 }
 
 
@@ -1771,7 +1763,7 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1747 "AppWindow.c"
+#line 1739 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1783,11 +1775,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1759 "AppWindow.c"
+#line 1751 "AppWindow.c"
 	} else {
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1763 "AppWindow.c"
+#line 1755 "AppWindow.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1795,13 +1787,13 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1771 "AppWindow.c"
+#line 1763 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1777 "AppWindow.c"
+#line 1769 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
@@ -1813,11 +1805,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1789 "AppWindow.c"
+#line 1781 "AppWindow.c"
 	} else {
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1793 "AppWindow.c"
+#line 1785 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1825,11 +1817,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1801 "AppWindow.c"
+#line 1793 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 1805 "AppWindow.c"
+#line 1797 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1838,17 +1830,17 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		_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 1814 "AppWindow.c"
+#line 1806 "AppWindow.c"
 	} else {
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1818 "AppWindow.c"
+#line 1810 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1824 "AppWindow.c"
+#line 1816 "AppWindow.c"
 }
 
 
@@ -1868,7 +1860,7 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1844 "AppWindow.c"
+#line 1836 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1880,11 +1872,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1856 "AppWindow.c"
+#line 1848 "AppWindow.c"
 	} else {
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1860 "AppWindow.c"
+#line 1852 "AppWindow.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1892,13 +1884,13 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1868 "AppWindow.c"
+#line 1860 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1874 "AppWindow.c"
+#line 1866 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
@@ -1910,11 +1902,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1886 "AppWindow.c"
+#line 1878 "AppWindow.c"
 	} else {
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1890 "AppWindow.c"
+#line 1882 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1922,11 +1914,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1898 "AppWindow.c"
+#line 1890 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 1902 "AppWindow.c"
+#line 1894 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1935,17 +1927,17 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		_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 1911 "AppWindow.c"
+#line 1903 "AppWindow.c"
 	} else {
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1915 "AppWindow.c"
+#line 1907 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1921 "AppWindow.c"
+#line 1913 "AppWindow.c"
 }
 
 
@@ -1963,7 +1955,7 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	_tmp1_ = self->priv->current_page;
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1939 "AppWindow.c"
+#line 1931 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1975,11 +1967,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1951 "AppWindow.c"
+#line 1943 "AppWindow.c"
 	} else {
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1955 "AppWindow.c"
+#line 1947 "AppWindow.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1987,11 +1979,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		result = TRUE;
 #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1963 "AppWindow.c"
+#line 1955 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 1967 "AppWindow.c"
+#line 1959 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2000,17 +1992,17 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		_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 1976 "AppWindow.c"
+#line 1968 "AppWindow.c"
 	} else {
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1980 "AppWindow.c"
+#line 1972 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1986 "AppWindow.c"
+#line 1978 "AppWindow.c"
 }
 
 
@@ -2028,7 +2020,7 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	_tmp1_ = self->priv->current_page;
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2004 "AppWindow.c"
+#line 1996 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -2040,11 +2032,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2016 "AppWindow.c"
+#line 2008 "AppWindow.c"
 	} else {
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2020 "AppWindow.c"
+#line 2012 "AppWindow.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -2052,11 +2044,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		result = TRUE;
 #line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2028 "AppWindow.c"
+#line 2020 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2032 "AppWindow.c"
+#line 2024 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2065,17 +2057,17 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		_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 2041 "AppWindow.c"
+#line 2033 "AppWindow.c"
 	} else {
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2045 "AppWindow.c"
+#line 2037 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2051 "AppWindow.c"
+#line 2043 "AppWindow.c"
 }
 
 
@@ -2092,7 +2084,7 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 	_tmp0_ = self->priv->current_page;
 #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 2068 "AppWindow.c"
+#line 2060 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 		GdkEventConfigure* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -2108,12 +2100,12 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 			result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return result;
-#line 2084 "AppWindow.c"
+#line 2076 "AppWindow.c"
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2089 "AppWindow.c"
+#line 2081 "AppWindow.c"
 		GdkEventConfigure* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2122,17 +2114,17 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 		_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 2098 "AppWindow.c"
+#line 2090 "AppWindow.c"
 	} else {
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 2102 "AppWindow.c"
+#line 2094 "AppWindow.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2108 "AppWindow.c"
+#line 2100 "AppWindow.c"
 }
 
 
@@ -2157,7 +2149,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	if (_tmp0_ > 0) {
 #line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2133 "AppWindow.c"
+#line 2125 "AppWindow.c"
 	}
 #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));
@@ -2185,7 +2177,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2161 "AppWindow.c"
+#line 2153 "AppWindow.c"
 }
 
 
@@ -2210,7 +2202,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		self->priv->busy_counter = 0;
 #line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2186 "AppWindow.c"
+#line 2178 "AppWindow.c"
 	} else {
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
@@ -2224,7 +2216,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		if (_tmp2_ > 0) {
 #line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 2200 "AppWindow.c"
+#line 2192 "AppWindow.c"
 		}
 	}
 #line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2253,7 +2245,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2229 "AppWindow.c"
+#line 2221 "AppWindow.c"
 }
 
 
@@ -2280,7 +2272,7 @@ static void page_window_class_init (PageWindowClass * klass) {
 	((GtkWidgetClass *) klass)->configure_event = page_window_real_configure_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2256 "AppWindow.c"
+#line 2248 "AppWindow.c"
 }
 
 
@@ -2291,7 +2283,7 @@ static void page_window_instance_init (PageWindow * self) {
 	self->priv->current_page = NULL;
 #line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = 0;
-#line 2267 "AppWindow.c"
+#line 2259 "AppWindow.c"
 }
 
 
@@ -2303,7 +2295,7 @@ static void page_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->current_page);
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2279 "AppWindow.c"
+#line 2271 "AppWindow.c"
 }
 
 
@@ -2322,84 +2314,84 @@ GType page_window_get_type (void) {
 static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_about ((AppWindow*) self);
-#line 2298 "AppWindow.c"
+#line 2290 "AppWindow.c"
 }
 
 
 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 2305 "AppWindow.c"
+#line 2297 "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 2312 "AppWindow.c"
+#line 2304 "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 2319 "AppWindow.c"
+#line 2311 "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 2326 "AppWindow.c"
+#line 2318 "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 2333 "AppWindow.c"
+#line 2325 "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 2340 "AppWindow.c"
+#line 2332 "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 2347 "AppWindow.c"
+#line 2339 "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 2354 "AppWindow.c"
+#line 2346 "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 2361 "AppWindow.c"
+#line 2353 "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 2368 "AppWindow.c"
+#line 2360 "AppWindow.c"
 }
 
 
 static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) {
 #line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2375 "AppWindow.c"
+#line 2367 "AppWindow.c"
 }
 
 
@@ -2436,7 +2428,7 @@ AppWindow* app_window_construct (GType object_type) {
 	gtk_window_set_default_icon_name ("shotwell");
 #line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2412 "AppWindow.c"
+#line 2404 "AppWindow.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -2453,7 +2445,7 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp5_;
 #line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2429 "AppWindow.c"
+#line 2421 "AppWindow.c"
 	} else {
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -2473,7 +2465,7 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp9_;
 #line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2449 "AppWindow.c"
+#line 2441 "AppWindow.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = self->dimensions;
@@ -2491,7 +2483,7 @@ AppWindow* app_window_construct (GType object_type) {
 	if (_tmp14_) {
 #line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2467 "AppWindow.c"
+#line 2459 "AppWindow.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = app_window_command_manager;
@@ -2513,24 +2505,24 @@ AppWindow* app_window_construct (GType object_type) {
 	_tmp18_ = gtk_css_provider_new ();
 #line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	provider = _tmp18_;
-#line 2489 "AppWindow.c"
+#line 2481 "AppWindow.c"
 	{
 		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 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2496 "AppWindow.c"
-			goto __catch223_g_error;
+#line 2488 "AppWindow.c"
+			goto __catch225_g_error;
 		}
 #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 2503 "AppWindow.c"
+#line 2495 "AppWindow.c"
 	}
-	goto __finally223;
-	__catch223_g_error:
+	goto __finally225;
+	__catch225_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -2547,9 +2539,9 @@ AppWindow* app_window_construct (GType object_type) {
 		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 2523 "AppWindow.c"
+#line 2515 "AppWindow.c"
 	}
-	__finally223:
+	__finally225:
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2560,13 +2552,13 @@ AppWindow* app_window_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2536 "AppWindow.c"
+#line 2528 "AppWindow.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (provider);
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 2542 "AppWindow.c"
+#line 2534 "AppWindow.c"
 }
 
 
@@ -2575,7 +2567,7 @@ static void app_window_real_on_fullscreen (AppWindow* self) {
 	g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 2551 "AppWindow.c"
+#line 2543 "AppWindow.c"
 }
 
 
@@ -2584,7 +2576,7 @@ void app_window_on_fullscreen (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 2560 "AppWindow.c"
+#line 2552 "AppWindow.c"
 }
 
 
@@ -2597,7 +2589,7 @@ gboolean app_window_has_instance (void) {
 	result = _tmp0_ != NULL;
 #line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2573 "AppWindow.c"
+#line 2565 "AppWindow.c"
 }
 
 
@@ -2613,7 +2605,7 @@ AppWindow* app_window_get_instance (void) {
 	result = _tmp1_;
 #line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2589 "AppWindow.c"
+#line 2581 "AppWindow.c"
 }
 
 
@@ -2629,7 +2621,7 @@ FullscreenWindow* app_window_get_fullscreen (void) {
 	result = _tmp1_;
 #line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2605 "AppWindow.c"
+#line 2597 "AppWindow.c"
 }
 
 
@@ -2645,7 +2637,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	_tmp0_ = gtk_builder_new ();
 #line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	builder = _tmp0_;
-#line 2621 "AppWindow.c"
+#line 2613 "AppWindow.c"
 	{
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -2686,12 +2678,12 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		_g_object_unref0 (_tmp2_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2662 "AppWindow.c"
-			goto __catch224_g_error;
+#line 2654 "AppWindow.c"
+			goto __catch226_g_error;
 		}
 	}
-	goto __finally224;
-	__catch224_g_error:
+	goto __finally226;
+	__catch226_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp10_ = NULL;
@@ -2708,9 +2700,9 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_warning ("AppWindow.vala:483: Unable to create Gtk.Builder: %s\n", _tmp11_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 2684 "AppWindow.c"
+#line 2676 "AppWindow.c"
 	}
-	__finally224:
+	__finally226:
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2721,7 +2713,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_clear_error (&_inner_error_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2697 "AppWindow.c"
+#line 2689 "AppWindow.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = user;
@@ -2731,7 +2723,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	result = builder;
 #line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2707 "AppWindow.c"
+#line 2699 "AppWindow.c"
 }
 
 
@@ -2748,7 +2740,7 @@ void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	_tmp1_ = parent;
 #line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2724 "AppWindow.c"
+#line 2716 "AppWindow.c"
 }
 
 
@@ -2778,7 +2770,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	_tmp1_ = parent;
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2754 "AppWindow.c"
+#line 2746 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2789,7 +2781,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2765 "AppWindow.c"
+#line 2757 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2798,7 +2790,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2774 "AppWindow.c"
+#line 2766 "AppWindow.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -2844,7 +2836,7 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	_g_object_unref0 (dialog);
 #line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2820 "AppWindow.c"
+#line 2812 "AppWindow.c"
 }
 
 
@@ -2879,7 +2871,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	_tmp1_ = parent;
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2855 "AppWindow.c"
+#line 2847 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2890,7 +2882,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 		_g_object_unref0 (_tmp0_);
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2866 "AppWindow.c"
+#line 2858 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2899,7 +2891,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 		_g_object_unref0 (_tmp0_);
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2875 "AppWindow.c"
+#line 2867 "AppWindow.c"
 	}
 #line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -2953,7 +2945,7 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	_g_object_unref0 (_tmp0_);
 #line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2929 "AppWindow.c"
+#line 2921 "AppWindow.c"
 }
 
 
@@ -2989,7 +2981,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	_tmp1_ = parent;
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2965 "AppWindow.c"
+#line 2957 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3000,7 +2992,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 		_g_object_unref0 (_tmp0_);
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2976 "AppWindow.c"
+#line 2968 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3009,7 +3001,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 		_g_object_unref0 (_tmp0_);
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2985 "AppWindow.c"
+#line 2977 "AppWindow.c"
 	}
 #line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
@@ -3065,7 +3057,7 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	_g_object_unref0 (_tmp0_);
 #line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3041 "AppWindow.c"
+#line 3033 "AppWindow.c"
 }
 
 
@@ -3099,7 +3091,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_tmp1_ = parent;
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3075 "AppWindow.c"
+#line 3067 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3110,7 +3102,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 		_g_object_unref0 (_tmp0_);
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3086 "AppWindow.c"
+#line 3078 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3119,7 +3111,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 		_g_object_unref0 (_tmp0_);
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3095 "AppWindow.c"
+#line 3087 "AppWindow.c"
 	}
 #line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
@@ -3143,17 +3135,17 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_tmp11_ = title;
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3119 "AppWindow.c"
+#line 3111 "AppWindow.c"
 		const gchar* _tmp12_ = NULL;
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3125 "AppWindow.c"
+#line 3117 "AppWindow.c"
 	} else {
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3129 "AppWindow.c"
+#line 3121 "AppWindow.c"
 	}
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
@@ -3185,7 +3177,7 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	_g_object_unref0 (_tmp0_);
 #line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3161 "AppWindow.c"
+#line 3153 "AppWindow.c"
 }
 
 
@@ -3222,7 +3214,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_tmp1_ = parent;
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3198 "AppWindow.c"
+#line 3190 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3233,7 +3225,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3209 "AppWindow.c"
+#line 3201 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3242,7 +3234,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 		_g_object_unref0 (_tmp0_);
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3218 "AppWindow.c"
+#line 3210 "AppWindow.c"
 	}
 #line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
@@ -3256,17 +3248,17 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_tmp8_ = title;
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3232 "AppWindow.c"
+#line 3224 "AppWindow.c"
 		const gchar* _tmp9_ = NULL;
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3238 "AppWindow.c"
+#line 3230 "AppWindow.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3242 "AppWindow.c"
+#line 3234 "AppWindow.c"
 	}
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
@@ -3302,7 +3294,7 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	_g_object_unref0 (_tmp0_);
 #line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3278 "AppWindow.c"
+#line 3270 "AppWindow.c"
 }
 
 
@@ -3329,7 +3321,7 @@ void app_window_database_error (GError* err) {
 	app_window_panic (_tmp4_);
 #line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp4_);
-#line 3302 "AppWindow.c"
+#line 3294 "AppWindow.c"
 }
 
 
@@ -3356,7 +3348,7 @@ void app_window_panic (const gchar* msg) {
 	application_panic (_tmp3_);
 #line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3329 "AppWindow.c"
+#line 3321 "AppWindow.c"
 }
 
 
@@ -3365,7 +3357,7 @@ static gchar* app_window_real_get_app_role (AppWindow* self) {
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3338 "AppWindow.c"
+#line 3330 "AppWindow.c"
 }
 
 
@@ -3374,7 +3366,7 @@ gchar* app_window_get_app_role (AppWindow* self) {
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3347 "AppWindow.c"
+#line 3339 "AppWindow.c"
 }
 
 
@@ -3405,7 +3397,7 @@ void app_window_on_about (AppWindow* self) {
 	_g_object_unref0 (_tmp4_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3378 "AppWindow.c"
+#line 3370 "AppWindow.c"
 }
 
 
@@ -3413,7 +3405,7 @@ static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3386 "AppWindow.c"
+#line 3378 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 #line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3422,12 +3414,12 @@ static void app_window_on_help_contents (AppWindow* self) {
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
 #line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3395 "AppWindow.c"
-			goto __catch225_g_error;
+#line 3387 "AppWindow.c"
+			goto __catch227_g_error;
 		}
 	}
-	goto __finally225;
-	__catch225_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3455,9 +3447,9 @@ static void app_window_on_help_contents (AppWindow* self) {
 		_g_free0 (_tmp5_);
 #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3428 "AppWindow.c"
+#line 3420 "AppWindow.c"
 	}
-	__finally225:
+	__finally227:
 #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3466,7 +3458,7 @@ static void app_window_on_help_contents (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3439 "AppWindow.c"
+#line 3431 "AppWindow.c"
 	}
 }
 
@@ -3475,18 +3467,18 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3448 "AppWindow.c"
+#line 3440 "AppWindow.c"
 	{
 #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
 #line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3454 "AppWindow.c"
-			goto __catch226_g_error;
+#line 3446 "AppWindow.c"
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally226;
-	__catch226_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3514,9 +3506,9 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		_g_free0 (_tmp4_);
 #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3487 "AppWindow.c"
+#line 3479 "AppWindow.c"
 	}
-	__finally226:
+	__finally228:
 #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3525,7 +3517,7 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3498 "AppWindow.c"
+#line 3490 "AppWindow.c"
 	}
 }
 
@@ -3534,18 +3526,18 @@ static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
 #line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3507 "AppWindow.c"
+#line 3499 "AppWindow.c"
 	{
 #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3513 "AppWindow.c"
-			goto __catch227_g_error;
+#line 3505 "AppWindow.c"
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3573,9 +3565,9 @@ static void app_window_on_help_faq (AppWindow* self) {
 		_g_free0 (_tmp4_);
 #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3546 "AppWindow.c"
+#line 3538 "AppWindow.c"
 	}
-	__finally227:
+	__finally229:
 #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3584,7 +3576,7 @@ static void app_window_on_help_faq (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3557 "AppWindow.c"
+#line 3549 "AppWindow.c"
 	}
 }
 
@@ -3600,7 +3592,7 @@ static void app_window_real_on_quit (AppWindow* self) {
 	application_exit (_tmp1_);
 #line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3573 "AppWindow.c"
+#line 3565 "AppWindow.c"
 }
 
 
@@ -3609,7 +3601,7 @@ void app_window_on_quit (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3582 "AppWindow.c"
+#line 3574 "AppWindow.c"
 }
 
 
@@ -3654,7 +3646,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	if (_tmp5_) {
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3627 "AppWindow.c"
+#line 3619 "AppWindow.c"
 	}
 #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -3676,7 +3668,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	if (_tmp13_ == NULL) {
 #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3649 "AppWindow.c"
+#line 3641 "AppWindow.c"
 	}
 #line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
@@ -3696,7 +3688,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_object_unref0 (media);
 #line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3669 "AppWindow.c"
+#line 3661 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -3722,12 +3714,12 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_object_unref0 (_tmp17_);
 #line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3695 "AppWindow.c"
-			goto __catch228_g_error;
+#line 3687 "AppWindow.c"
+			goto __catch230_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally230;
+	__catch230_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_ = NULL;
@@ -3749,9 +3741,9 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_free0 (_tmp23_);
 #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3722 "AppWindow.c"
+#line 3714 "AppWindow.c"
 	}
-	__finally228:
+	__finally230:
 #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3762,11 +3754,11 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		g_clear_error (&_inner_error_);
 #line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3735 "AppWindow.c"
+#line 3727 "AppWindow.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3739 "AppWindow.c"
+#line 3731 "AppWindow.c"
 }
 
 
@@ -3776,20 +3768,20 @@ static void app_window_real_destroy (GtkWidget* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3749 "AppWindow.c"
+#line 3741 "AppWindow.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3762 "AppWindow.c"
+#line 3754 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3802,100 +3794,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3793 "AppWindow.c"
-				goto __catch229_g_regex_error;
+#line 3785 "AppWindow.c"
+				goto __catch231_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3802 "AppWindow.c"
+#line 3794 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3818 "AppWindow.c"
-				goto __catch229_g_regex_error;
+#line 3810 "AppWindow.c"
+				goto __catch231_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3829 "AppWindow.c"
+#line 3821 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3843 "AppWindow.c"
+#line 3835 "AppWindow.c"
 	}
-	goto __finally229;
-	__catch229_g_regex_error:
+	goto __finally231;
+	__catch231_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3857 "AppWindow.c"
+#line 3849 "AppWindow.c"
 	}
-	__finally229:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally231:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3868 "AppWindow.c"
+#line 3860 "AppWindow.c"
 	}
 }
 
@@ -3920,7 +3912,7 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	_g_free0 (_tmp1_);
 #line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3893 "AppWindow.c"
+#line 3885 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3952,7 +3944,7 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 			_g_free0 (tmp);
 #line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3925 "AppWindow.c"
+#line 3917 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -3994,12 +3986,12 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 			_g_free0 (tmp);
 #line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3967 "AppWindow.c"
+#line 3959 "AppWindow.c"
 		}
 	}
 #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3972 "AppWindow.c"
+#line 3964 "AppWindow.c"
 }
 
 
@@ -4026,7 +4018,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3999 "AppWindow.c"
+#line 3991 "AppWindow.c"
 	}
 }
 
@@ -4034,7 +4026,7 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 static void app_window_real_add_actions (AppWindow* self) {
 #line 675 "/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 4007 "AppWindow.c"
+#line 3999 "AppWindow.c"
 }
 
 
@@ -4043,7 +4035,7 @@ void app_window_add_actions (AppWindow* self) {
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 4016 "AppWindow.c"
+#line 4008 "AppWindow.c"
 }
 
 
@@ -4068,7 +4060,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	_tmp0_ = app_window_fullscreen_window;
 #line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4041 "AppWindow.c"
+#line 4033 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
 #line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
@@ -4076,7 +4068,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
 #line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4049 "AppWindow.c"
+#line 4041 "AppWindow.c"
 	}
 #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
@@ -4104,7 +4096,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	_g_object_unref0 (_tmp7_);
 #line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4077 "AppWindow.c"
+#line 4069 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
@@ -4118,7 +4110,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
 #line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4091 "AppWindow.c"
+#line 4083 "AppWindow.c"
 	}
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
@@ -4134,7 +4126,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
 #line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4107 "AppWindow.c"
+#line 4099 "AppWindow.c"
 }
 
 
@@ -4155,7 +4147,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 	if (_tmp0_ == NULL) {
 #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4128 "AppWindow.c"
+#line 4120 "AppWindow.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
@@ -4175,7 +4167,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 	_g_object_unref0 (_tmp4_);
 #line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4148 "AppWindow.c"
+#line 4140 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
@@ -4189,7 +4181,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
 #line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4162 "AppWindow.c"
+#line 4154 "AppWindow.c"
 	}
 #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
@@ -4205,7 +4197,7 @@ void app_window_end_fullscreen (AppWindow* self) {
 	app_window_fullscreen_window = NULL;
 #line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4178 "AppWindow.c"
+#line 4170 "AppWindow.c"
 }
 
 
@@ -4228,7 +4220,7 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	result = _tmp2_;
 #line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4201 "AppWindow.c"
+#line 4193 "AppWindow.c"
 }
 
 
@@ -4252,7 +4244,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	if (_tmp2_ == NULL) {
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4225 "AppWindow.c"
+#line 4217 "AppWindow.c"
 	}
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4260,7 +4252,7 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	_tmp3_ = action;
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4233 "AppWindow.c"
+#line 4225 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4269,11 +4261,11 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 		_tmp5_ = sensitive;
 #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4242 "AppWindow.c"
+#line 4234 "AppWindow.c"
 	}
 #line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4246 "AppWindow.c"
+#line 4238 "AppWindow.c"
 }
 
 
@@ -4297,7 +4289,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	if (_tmp2_ == NULL) {
 #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4270 "AppWindow.c"
+#line 4262 "AppWindow.c"
 	}
 #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4305,7 +4297,7 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	_tmp3_ = action;
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4278 "AppWindow.c"
+#line 4270 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
@@ -4317,11 +4309,11 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 		_tmp6_ = _tmp5_;
 #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4290 "AppWindow.c"
+#line 4282 "AppWindow.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4294 "AppWindow.c"
+#line 4286 "AppWindow.c"
 }
 
 
@@ -4345,7 +4337,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	if (_tmp2_ == NULL) {
 #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4318 "AppWindow.c"
+#line 4310 "AppWindow.c"
 	}
 #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -4353,7 +4345,7 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	_tmp3_ = action;
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4326 "AppWindow.c"
+#line 4318 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
@@ -4365,32 +4357,32 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 		_tmp6_ = _tmp5_;
 #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4338 "AppWindow.c"
+#line 4330 "AppWindow.c"
 	}
 #line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4342 "AppWindow.c"
+#line 4334 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4349 "AppWindow.c"
+#line 4341 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
 #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4356 "AppWindow.c"
+#line 4348 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4363 "AppWindow.c"
+#line 4355 "AppWindow.c"
 }
 
 
@@ -4418,7 +4410,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	_tmp2_ = old_page;
 #line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4391 "AppWindow.c"
+#line 4383 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4467,13 +4459,13 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		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 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4440 "AppWindow.c"
+#line 4432 "AppWindow.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
 #line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4446 "AppWindow.c"
+#line 4438 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -4546,7 +4538,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		_data_collection_unref0 (_tmp32_);
 #line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4519 "AppWindow.c"
+#line 4511 "AppWindow.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
@@ -4554,7 +4546,7 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	_tmp35_ = new_page;
 #line 756 "/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 4527 "AppWindow.c"
+#line 4519 "AppWindow.c"
 }
 
 
@@ -4573,7 +4565,7 @@ static void app_window_real_update_common_action_availability (AppWindow* self,
 	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
 #line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4546 "AppWindow.c"
+#line 4538 "AppWindow.c"
 }
 
 
@@ -4582,7 +4574,7 @@ void app_window_update_common_action_availability (AppWindow* self, Page* old_pa
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4555 "AppWindow.c"
+#line 4547 "AppWindow.c"
 }
 
 
@@ -4595,13 +4587,13 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page,
 	_tmp0_ = page;
 #line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4568 "AppWindow.c"
+#line 4560 "AppWindow.c"
 		gint _tmp1_ = 0;
 #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
 #line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4574 "AppWindow.c"
+#line 4566 "AppWindow.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
@@ -4611,7 +4603,7 @@ static void app_window_real_update_common_actions (AppWindow* self, Page* page,
 	app_window_decorate_undo_action (self);
 #line 778 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4584 "AppWindow.c"
+#line 4576 "AppWindow.c"
 }
 
 
@@ -4620,7 +4612,7 @@ void app_window_update_common_actions (AppWindow* self, Page* page, gint selecte
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4593 "AppWindow.c"
+#line 4585 "AppWindow.c"
 }
 
 
@@ -4638,7 +4630,7 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	_tmp1_ = page;
 #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4611 "AppWindow.c"
+#line 4603 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -4672,11 +4664,11 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		_data_collection_unref0 (_tmp9_);
 #line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4645 "AppWindow.c"
+#line 4637 "AppWindow.c"
 	}
 #line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4649 "AppWindow.c"
+#line 4641 "AppWindow.c"
 }
 
 
@@ -4709,7 +4701,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	if (_tmp3_ == NULL) {
 #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4682 "AppWindow.c"
+#line 4674 "AppWindow.c"
 	}
 #line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
@@ -4725,7 +4717,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 		_g_object_unref0 (bar);
 #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4698 "AppWindow.c"
+#line 4690 "AppWindow.c"
 	}
 #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
@@ -4733,19 +4725,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	_tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel));
 #line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4706 "AppWindow.c"
+#line 4698 "AppWindow.c"
 	{
 		gint i = 0;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4711 "AppWindow.c"
+#line 4703 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4718 "AppWindow.c"
+#line 4710 "AppWindow.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				GMenuModel* model = NULL;
@@ -4758,13 +4750,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				gint _tmp17_ = 0;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4731 "AppWindow.c"
+#line 4723 "AppWindow.c"
 					gint _tmp9_ = 0;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4737 "AppWindow.c"
+#line 4729 "AppWindow.c"
 				}
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
@@ -4776,7 +4768,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				if (!(_tmp10_ < _tmp11_)) {
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4749 "AppWindow.c"
+#line 4741 "AppWindow.c"
 				}
 #line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
@@ -4794,7 +4786,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 					_g_object_unref0 (model);
 #line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4767 "AppWindow.c"
+#line 4759 "AppWindow.c"
 				}
 #line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
@@ -4802,19 +4794,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
 #line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4775 "AppWindow.c"
+#line 4767 "AppWindow.c"
 				{
 					gint j = 0;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4780 "AppWindow.c"
+#line 4772 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4787 "AppWindow.c"
+#line 4779 "AppWindow.c"
 							gint _tmp20_ = 0;
 							gint _tmp21_ = 0;
 							GMenuModel* subsection = NULL;
@@ -4827,13 +4819,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							gint _tmp27_ = 0;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4800 "AppWindow.c"
+#line 4792 "AppWindow.c"
 								gint _tmp19_ = 0;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4806 "AppWindow.c"
+#line 4798 "AppWindow.c"
 							}
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
@@ -4845,7 +4837,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							if (!(_tmp20_ < _tmp21_)) {
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4818 "AppWindow.c"
+#line 4810 "AppWindow.c"
 							}
 #line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
@@ -4863,7 +4855,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 								_g_object_unref0 (subsection);
 #line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4836 "AppWindow.c"
+#line 4828 "AppWindow.c"
 							}
 #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
@@ -4871,19 +4863,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
 #line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4844 "AppWindow.c"
+#line 4836 "AppWindow.c"
 							{
 								gint k = 0;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4849 "AppWindow.c"
+#line 4841 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4856 "AppWindow.c"
+#line 4848 "AppWindow.c"
 										gint _tmp30_ = 0;
 										gint _tmp31_ = 0;
 										GMenuAttributeIter* it = NULL;
@@ -4892,13 +4884,13 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 										GMenuAttributeIter* _tmp34_ = NULL;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4865 "AppWindow.c"
+#line 4857 "AppWindow.c"
 											gint _tmp29_ = 0;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4871 "AppWindow.c"
+#line 4863 "AppWindow.c"
 										}
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
@@ -4910,7 +4902,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 										if (!(_tmp30_ < _tmp31_)) {
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4883 "AppWindow.c"
+#line 4875 "AppWindow.c"
 										}
 #line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
@@ -4922,7 +4914,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 										it = _tmp34_;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4895 "AppWindow.c"
+#line 4887 "AppWindow.c"
 											GMenuAttributeIter* _tmp35_ = NULL;
 											gboolean _tmp36_ = FALSE;
 											gboolean _tmp37_ = FALSE;
@@ -4937,7 +4929,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 											if (!_tmp36_) {
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4910 "AppWindow.c"
+#line 4902 "AppWindow.c"
 											}
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
@@ -4945,7 +4937,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4918 "AppWindow.c"
+#line 4910 "AppWindow.c"
 												GMenuAttributeIter* _tmp41_ = NULL;
 												GVariant* _tmp42_ = NULL;
 												GVariant* _tmp43_ = NULL;
@@ -4965,17 +4957,17 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4938 "AppWindow.c"
+#line 4930 "AppWindow.c"
 											} else {
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4942 "AppWindow.c"
+#line 4934 "AppWindow.c"
 											}
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4948 "AppWindow.c"
+#line 4940 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
 												GMenuAttributeIter* _tmp47_ = NULL;
@@ -4986,7 +4978,7 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4959 "AppWindow.c"
+#line 4951 "AppWindow.c"
 													GMenuAttributeIter* _tmp49_ = NULL;
 													GVariant* _tmp50_ = NULL;
 													GVariant* _tmp51_ = NULL;
@@ -5017,19 +5009,19 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													_g_free0 (_tmp55_);
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4990 "AppWindow.c"
+#line 4982 "AppWindow.c"
 												} else {
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4994 "AppWindow.c"
+#line 4986 "AppWindow.c"
 												}
 #line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4998 "AppWindow.c"
+#line 4990 "AppWindow.c"
 											}
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 5002 "AppWindow.c"
+#line 4994 "AppWindow.c"
 												GMenu* md = NULL;
 												GMenuModel* _tmp57_ = NULL;
 												GMenu* _tmp58_ = NULL;
@@ -5092,37 +5084,37 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												_g_object_unref0 (bar);
 #line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5065 "AppWindow.c"
+#line 5057 "AppWindow.c"
 											}
 										}
 #line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5070 "AppWindow.c"
+#line 5062 "AppWindow.c"
 									}
 								}
 							}
 #line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5076 "AppWindow.c"
+#line 5068 "AppWindow.c"
 						}
 					}
 				}
 #line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5082 "AppWindow.c"
+#line 5074 "AppWindow.c"
 			}
 		}
 	}
 #line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5088 "AppWindow.c"
+#line 5080 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
 #line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5095 "AppWindow.c"
+#line 5087 "AppWindow.c"
 }
 
 
@@ -5138,7 +5130,7 @@ CommandManager* app_window_get_command_manager (void) {
 	result = _tmp1_;
 #line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5111 "AppWindow.c"
+#line 5103 "AppWindow.c"
 }
 
 
@@ -5149,7 +5141,7 @@ static void app_window_on_command_manager_altered (AppWindow* self) {
 	app_window_decorate_undo_action (self);
 #line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5122 "AppWindow.c"
+#line 5114 "AppWindow.c"
 }
 
 
@@ -5185,7 +5177,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	if (_tmp2_ == NULL) {
 #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5158 "AppWindow.c"
+#line 5150 "AppWindow.c"
 	}
 #line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
@@ -5197,7 +5189,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_g_object_unref0 (action);
 #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5170 "AppWindow.c"
+#line 5162 "AppWindow.c"
 	}
 #line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
@@ -5209,7 +5201,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	_tmp6_ = desc;
 #line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5182 "AppWindow.c"
+#line 5174 "AppWindow.c"
 		const gchar* _tmp7_ = NULL;
 		CommandDescription* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5244,7 +5236,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_tmp14_ = action;
 #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5217 "AppWindow.c"
+#line 5209 "AppWindow.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
@@ -5261,7 +5253,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		_tmp17_ = action;
 #line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5234 "AppWindow.c"
+#line 5226 "AppWindow.c"
 	}
 #line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
@@ -5273,7 +5265,7 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	_g_free0 (label);
 #line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5246 "AppWindow.c"
+#line 5238 "AppWindow.c"
 }
 
 
@@ -5298,7 +5290,7 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	_g_object_unref0 (_tmp3_);
 #line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5271 "AppWindow.c"
+#line 5263 "AppWindow.c"
 }
 
 
@@ -5323,7 +5315,7 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	_g_object_unref0 (_tmp3_);
 #line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5296 "AppWindow.c"
+#line 5288 "AppWindow.c"
 }
 
 
@@ -5335,7 +5327,7 @@ static void app_window_on_undo (AppWindow* self) {
 	_tmp0_ = app_window_command_manager;
 #line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5308 "AppWindow.c"
+#line 5300 "AppWindow.c"
 }
 
 
@@ -5347,7 +5339,7 @@ static void app_window_on_redo (AppWindow* self) {
 	_tmp0_ = app_window_command_manager;
 #line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5320 "AppWindow.c"
+#line 5312 "AppWindow.c"
 }
 
 
@@ -5366,7 +5358,7 @@ static void app_window_on_select_all (AppWindow* self) {
 	if (_tmp1_ == NULL) {
 #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5339 "AppWindow.c"
+#line 5331 "AppWindow.c"
 	}
 #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5374,7 +5366,7 @@ static void app_window_on_select_all (AppWindow* self) {
 	_tmp2_ = page;
 #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5347 "AppWindow.c"
+#line 5339 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -5388,11 +5380,11 @@ static void app_window_on_select_all (AppWindow* self) {
 		view_collection_select_all (_tmp5_);
 #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5361 "AppWindow.c"
+#line 5353 "AppWindow.c"
 	}
 #line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5365 "AppWindow.c"
+#line 5357 "AppWindow.c"
 }
 
 
@@ -5411,7 +5403,7 @@ static void app_window_on_select_none (AppWindow* self) {
 	if (_tmp1_ == NULL) {
 #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5384 "AppWindow.c"
+#line 5376 "AppWindow.c"
 	}
 #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
@@ -5419,7 +5411,7 @@ static void app_window_on_select_none (AppWindow* self) {
 	_tmp2_ = page;
 #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5392 "AppWindow.c"
+#line 5384 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -5433,11 +5425,11 @@ static void app_window_on_select_none (AppWindow* self) {
 		view_collection_unselect_all (_tmp5_);
 #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5406 "AppWindow.c"
+#line 5398 "AppWindow.c"
 	}
 #line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5410 "AppWindow.c"
+#line 5402 "AppWindow.c"
 }
 
 
@@ -5463,7 +5455,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	_tmp2_ = self->maximized;
 #line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5436 "AppWindow.c"
+#line 5428 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 #line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -5472,7 +5464,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 		self->dimensions.width = _tmp3_;
 #line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5445 "AppWindow.c"
+#line 5437 "AppWindow.c"
 	}
 #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
@@ -5482,7 +5474,7 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	result = _tmp6_;
 #line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5455 "AppWindow.c"
+#line 5447 "AppWindow.c"
 }
 
 
@@ -5509,7 +5501,7 @@ static void app_window_class_init (AppWindowClass * klass) {
 	((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 5482 "AppWindow.c"
+#line 5474 "AppWindow.c"
 }
 
 
@@ -5520,7 +5512,7 @@ static void app_window_instance_init (AppWindow * self) {
 	self->pos_x = 0;
 #line 405 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = 0;
-#line 5493 "AppWindow.c"
+#line 5485 "AppWindow.c"
 }
 
 
@@ -5530,7 +5522,7 @@ static void app_window_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 5503 "AppWindow.c"
+#line 5495 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 99f054d..3b69156 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -28,8 +28,8 @@ public class FullscreenWindow : PageWindow {
 
         set_current_page(page);
 
-        AppWindow.get_instance().add_action_entries (entries, this);
-        const string[] accels = { "F11" };
+        this.add_action_entries (entries, this);
+        const string[] accels = { "F11", null };
         Application.set_accels_for_action ("win.LeaveFullscreen", accels);
 
         set_screen(AppWindow.get_instance().get_screen());
diff --git a/src/Application.c b/src/Application.c
index 8d958cc..9d858e4 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.32.1, the Vala compiler
+/* Application.c generated by valac 0.34.4, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -127,7 +127,6 @@ 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);
-void application_set_appmenu (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;
@@ -157,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 161 "Application.c"
+#line 160 "Application.c"
 }
 
 
@@ -172,14 +171,14 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	result = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 176 "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 183 "Application.c"
+#line 182 "Application.c"
 }
 
 
@@ -197,7 +196,7 @@ GtkApplication* application_get_system_app (Application* self) {
 	result = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 201 "Application.c"
+#line 200 "Application.c"
 }
 
 
@@ -206,21 +205,21 @@ static gint _application_on_command_line_g_application_command_line (GApplicatio
 	result = application_on_command_line (command_line);
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 210 "Application.c"
+#line 209 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) {
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 217 "Application.c"
+#line 216 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 224 "Application.c"
+#line 223 "Application.c"
 }
 
 
@@ -238,7 +237,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp0_ = is_direct;
 #line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 242 "Application.c"
+#line 241 "Application.c"
 		GtkApplication* _tmp1_ = NULL;
 #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);
@@ -246,7 +245,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_object_unref0 (self->priv->system_app);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp1_;
-#line 250 "Application.c"
+#line 249 "Application.c"
 	} else {
 		GtkApplication* _tmp2_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
@@ -255,7 +254,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_object_unref0 (self->priv->system_app);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp2_;
-#line 259 "Application.c"
+#line 258 "Application.c"
 	}
 	{
 		GtkApplication* _tmp3_ = NULL;
@@ -265,12 +264,12 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_);
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 269 "Application.c"
-			goto __catch555_g_error;
+#line 268 "Application.c"
+			goto __catch557_g_error;
 		}
 	}
-	goto __finally555;
-	__catch555_g_error:
+	goto __finally557;
+	__catch557_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -281,9 +280,9 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		application_panic (self);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_error_free0 (e);
-#line 285 "Application.c"
+#line 284 "Application.c"
 	}
-	__finally555:
+	__finally557:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -292,7 +291,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_clear_error (&_inner_error_);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		return NULL;
-#line 296 "Application.c"
+#line 295 "Application.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
@@ -302,13 +301,13 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp5_ = self->priv->direct;
 #line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp5_) {
-#line 306 "Application.c"
+#line 305 "Application.c"
 		GtkApplication* _tmp6_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = self->priv->system_app;
 #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 312 "Application.c"
+#line 311 "Application.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
@@ -320,14 +319,14 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return self;
-#line 324 "Application.c"
+#line 323 "Application.c"
 }
 
 
 static Application* application_new (gboolean is_direct) {
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return application_construct (TYPE_APPLICATION, is_direct);
-#line 331 "Application.c"
+#line 330 "Application.c"
 }
 
 
@@ -356,7 +355,7 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
 	g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_);
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 360 "Application.c"
+#line 359 "Application.c"
 }
 
 
@@ -379,7 +378,7 @@ void application_present_primary_instance (void) {
 	g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 383 "Application.c"
+#line 382 "Application.c"
 }
 
 
@@ -406,7 +405,7 @@ gboolean application_get_is_remote (void) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 410 "Application.c"
+#line 409 "Application.c"
 }
 
 
@@ -430,7 +429,7 @@ gboolean application_get_is_direct (void) {
 	result = _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 434 "Application.c"
+#line 433 "Application.c"
 }
 
 
@@ -459,7 +458,7 @@ void application_set_accels_for_action (const gchar* action, gchar** accel, int
 	gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 463 "Application.c"
+#line 462 "Application.c"
 }
 
 
@@ -482,30 +481,7 @@ void application_set_menubar (GMenuModel* model) {
 	gtk_application_set_menubar (_tmp2_, _tmp3_);
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 486 "Application.c"
-}
-
-
-void application_set_appmenu (GMenuModel* model) {
-	Application* _tmp0_ = NULL;
-	Application* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	GMenuModel* _tmp3_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
-	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	_tmp0_ = application_get_instance ();
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	_tmp1_ = _tmp0_;
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	_tmp2_ = _tmp1_->priv->system_app;
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	_tmp3_ = model;
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	gtk_application_set_app_menu (_tmp2_, _tmp3_);
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
-	_application_unref0 (_tmp1_);
-#line 509 "Application.c"
+#line 485 "Application.c"
 }
 
 
@@ -514,7 +490,7 @@ void application_set_appmenu (GMenuModel* model) {
      *
      * The most likely scenario for this to be fired is if the user
      * either tried to run us twice in library mode, or we've just gotten
-     * a camera/removeable-storage mount; in either case, the remote instance
+     * a camera/removable-storage mount; in either case, the remote instance
      * will trigger this and exit, and we'll need to bring the window back up...
      */
 void application_on_activated (void) {
@@ -525,58 +501,58 @@ void application_on_activated (void) {
 	LibraryWindow* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	LibraryWindow* _tmp5_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 121 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 121 "/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 121 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ == NULL) {
-#line 121 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 543 "Application.c"
+#line 519 "Application.c"
 	}
-#line 121 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = lw;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 551 "Application.c"
+#line 527 "Application.c"
 		gboolean _tmp6_ = FALSE;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 557 "Application.c"
+#line 533 "Application.c"
 	} else {
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 561 "Application.c"
+#line 537 "Application.c"
 	}
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 565 "Application.c"
+#line 541 "Application.c"
 		LibraryWindow* _tmp7_ = NULL;
 		LibraryWindow* _tmp8_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp8_ = _tmp7_;
-#line 123 "/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 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 576 "Application.c"
+#line 552 "Application.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 114 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 580 "Application.c"
+#line 556 "Application.c"
 }
 
 
@@ -598,101 +574,101 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint _argv_size_ = 0;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 135 "/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 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = acl;
-#line 136 "/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 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = _tmp2_;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	argv_length1 = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	_argv_size_ = argv_length1;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = argv;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3__length1 = argv_length1;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 620 "Application.c"
+#line 596 "Application.c"
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 627 "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 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection = _tmp4_;
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection_length1 = _tmp4__length1;
-#line 139 "/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 639 "Application.c"
+#line 615 "Application.c"
 				gchar* _tmp5_ = NULL;
 				gchar* s = NULL;
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 646 "Application.c"
+#line 622 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
 					AppWindow* _tmp6_ = NULL;
 					LibraryWindow* _tmp7_ = NULL;
 					LibraryWindow* _tmp8_ = NULL;
-#line 140 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
-#line 140 "/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 140 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp7_ == NULL) {
-#line 140 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 660 "Application.c"
+#line 636 "Application.c"
 					}
-#line 140 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
-#line 141 "/home/jens/Source/shotwell/src/Application.vala"
+#line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp8_ = lw;
-#line 141 "/home/jens/Source/shotwell/src/Application.vala"
+#line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 668 "Application.c"
+#line 644 "Application.c"
 						LibraryWindow* _tmp9_ = NULL;
 						const gchar* _tmp10_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
-#line 142 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
-#line 142 "/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 677 "Application.c"
+#line 653 "Application.c"
 					}
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
-#line 139 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 683 "Application.c"
+#line 659 "Application.c"
 				}
 			}
 		}
 	}
-#line 146 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	result = 0;
-#line 147 "/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 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 696 "Application.c"
+#line 672 "Application.c"
 }
 
 
@@ -709,22 +685,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      */
 void application_init (gboolean is_direct) {
 	Application* _tmp0_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/Application.vala"
+#line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 162 "/home/jens/Source/shotwell/src/Application.vala"
+#line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 717 "Application.c"
+#line 693 "Application.c"
 		gboolean _tmp1_ = FALSE;
 		Application* _tmp2_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = application_new (_tmp1_);
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_application_unref0 (application_instance);
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 728 "Application.c"
+#line 704 "Application.c"
 	}
 }
 
@@ -732,22 +708,22 @@ void application_init (gboolean is_direct) {
 void application_terminate (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	application_exit (_tmp1_);
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 744 "Application.c"
+#line 720 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 751 "Application.c"
+#line 727 "Application.c"
 }
 
 
@@ -756,19 +732,19 @@ Application* application_get_instance (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 171 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp0_ != NULL, "instance != null");
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = application_instance;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _application_ref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp2_;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 772 "Application.c"
+#line 748 "Application.c"
 }
 
 
@@ -788,78 +764,78 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	guint _tmp13_ = 0U;
 	GtkApplication* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 172 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 177 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->running;
-#line 177 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 178 "/home/jens/Source/shotwell/src/Application.vala"
+#line 174 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 800 "Application.c"
+#line 776 "Application.c"
 	}
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 178 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "starting");
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 184 "/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 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = _tmp4_;
-#line 185 "/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 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp5_);
-#line 186 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = self->priv->system_app;
-#line 186 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = argv;
-#line 186 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7__length1 = argv_length1;
-#line 186 "/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 186 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->system_app_run_retval = _tmp8_;
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp9_ = self->priv->direct;
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 838 "Application.c"
+#line 814 "Application.c"
 		GtkApplication* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
-#line 189 "/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 189 "/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 847 "Application.c"
+#line 823 "Application.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
-#line 192 "/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 192 "/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 193 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp14_ = self->priv->system_app;
-#line 193 "/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 193 "/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 195 "/home/jens/Source/shotwell/src/Application.vala"
+#line 191 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 863 "Application.c"
+#line 839 "Application.c"
 }
 
 
@@ -867,58 +843,58 @@ void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkApplication* _tmp3_ = NULL;
-#line 198 "/home/jens/Source/shotwell/src/Application.vala"
+#line 194 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = self->priv->exiting_fired;
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp1_) {
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 879 "Application.c"
+#line 855 "Application.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 886 "Application.c"
+#line 862 "Application.c"
 	}
-#line 201 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 202 "/home/jens/Source/shotwell/src/Application.vala"
+#line 198 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 892 "Application.c"
+#line 868 "Application.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/Application.vala"
+#line 200 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
-#line 206 "/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 208 "/home/jens/Source/shotwell/src/Application.vala"
+#line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 208 "/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 902 "Application.c"
+#line 878 "Application.c"
 }
 
 
 void application_panic (Application* self) {
 	gboolean _tmp0_ = FALSE;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 209 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 214 "/home/jens/Source/shotwell/src/Application.vala"
+#line 210 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->exiting_fired;
-#line 214 "/home/jens/Source/shotwell/src/Application.vala"
+#line 210 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp0_) {
-#line 215 "/home/jens/Source/shotwell/src/Application.vala"
+#line 211 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
-#line 216 "/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 918 "Application.c"
+#line 894 "Application.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 922 "Application.c"
+#line 898 "Application.c"
 }
 
 
@@ -938,29 +914,29 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	const gchar* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 228 "/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 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = what;
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = reason;
-#line 229 "/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 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = _tmp5_;
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp6_;
-#line 229 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 964 "Application.c"
+#line 940 "Application.c"
 }
 
 
@@ -971,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 236 "/home/jens/Source/shotwell/src/Application.vala"
+#line 232 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = cookie;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 983 "Application.c"
+#line 959 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 240 "/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 241 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app_run_retval;
-#line 241 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp0_;
-#line 241 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 998 "Application.c"
+#line 974 "Application.c"
 }
 
 
@@ -1013,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 1017 "Application.c"
+#line 993 "Application.c"
 }
 
 
@@ -1022,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 1026 "Application.c"
+#line 1002 "Application.c"
 	}
 }
 
@@ -1032,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 1036 "Application.c"
+#line 1012 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1040 "Application.c"
+#line 1016 "Application.c"
 	}
 }
 
@@ -1044,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 1048 "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 1055 "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 1062 "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 1066 "Application.c"
+#line 1042 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 1070 "Application.c"
+#line 1046 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1074 "Application.c"
+#line 1050 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1078 "Application.c"
+#line 1054 "Application.c"
 }
 
 
@@ -1085,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 1089 "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 1095 "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 1099 "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 1103 "Application.c"
+#line 1079 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1107 "Application.c"
+#line 1083 "Application.c"
 }
 
 
@@ -1117,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 1121 "Application.c"
+#line 1097 "Application.c"
 }
 
 
@@ -1126,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 1130 "Application.c"
+#line 1106 "Application.c"
 }
 
 
@@ -1146,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 1150 "Application.c"
+#line 1126 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1154 "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 1160 "Application.c"
+#line 1136 "Application.c"
 	}
 }
 
@@ -1175,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 1179 "Application.c"
+#line 1155 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1183 "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 1189 "Application.c"
+#line 1165 "Application.c"
 	}
 }
 
@@ -1209,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 1213 "Application.c"
+#line 1189 "Application.c"
 }
 
 
@@ -1228,7 +1204,7 @@ static void application_instance_init (Application * self) {
 	self->priv->exiting_fired = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self->ref_count = 1;
-#line 1232 "Application.c"
+#line 1208 "Application.c"
 }
 
 
@@ -1240,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 1244 "Application.c"
+#line 1220 "Application.c"
 }
 
 
@@ -1265,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 1269 "Application.c"
+#line 1245 "Application.c"
 }
 
 
@@ -1278,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 1282 "Application.c"
+#line 1258 "Application.c"
 	}
 }
 
diff --git a/src/Application.vala b/src/Application.vala
index 6e6ba85..a1fff47 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -103,16 +103,12 @@ public class Application {
         get_instance().system_app.set_menubar (model);
     }
 
-    public static void set_appmenu (GLib.MenuModel? model) {
-        get_instance().system_app.set_app_menu (model);
-    }
-
     /**
      * @brief Signal handler for GApplication's 'command-line' signal.
      *
      * The most likely scenario for this to be fired is if the user
      * either tried to run us twice in library mode, or we've just gotten
-     * a camera/removeable-storage mount; in either case, the remote instance
+     * a camera/removable-storage mount; in either case, the remote instance
      * will trigger this and exit, and we'll need to bring the window back up...
      */
     public static void on_activated() {
diff --git a/src/BatchImport.c b/src/BatchImport.c
index bc67168..032c624 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.32.1, the Vala compiler
+/* BatchImport.c generated by valac 0.34.4, the Vala compiler
  * generated from BatchImport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5472,7 +5472,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 #line 5473 "BatchImport.c"
 		GeeHashSet* _tmp21_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+		_tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (self->priv->skipset);
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -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 __catch407_g_error;
+					goto __catch409_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
 #line 5778 "BatchImport.c"
 			}
-			goto __finally407;
-			__catch407_g_error:
+			goto __finally409;
+			__catch409_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"
 			}
-			__finally407:
+			__finally409:
 #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 __catch408_g_error;
+						goto __catch410_g_error;
 					}
 				}
-				goto __finally408;
-				__catch408_g_error:
+				goto __finally410;
+				__catch410_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"
 				}
-				__finally408:
+				__finally410:
 #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 __catch409_g_error;
+					goto __catch411_g_error;
 				}
 			}
-			goto __finally409;
-			__catch409_g_error:
+			goto __finally411;
+			__catch411_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"
 			}
-			__finally409:
+			__finally411:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10413,7 +10413,7 @@ static void batch_import_class_init (BatchImportClass * klass) {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, GDK_TYPE_PIXBUF, G_TYPE_INT);
+	g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10460,7 +10460,7 @@ static void batch_import_instance_init (BatchImport * self) {
 #line 428 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->last_preparing_ms = (gulong) 0;
 #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->imported_full_md5_table = _tmp0_;
 #line 433 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -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 __catch410_g_error;
+					goto __catch412_g_error;
 				}
 			}
-			goto __finally410;
-			__catch410_g_error:
+			goto __finally412;
+			__catch412_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"
 			}
-			__finally410:
+			__finally412:
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -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 __catch411_g_error;
+				goto __catch413_g_error;
 			}
 		}
-		goto __finally411;
-		__catch411_g_error:
+		goto __finally413;
+		__catch413_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"
 		}
-		__finally411:
+		__finally413:
 #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 __catch412_g_error;
+					goto __catch414_g_error;
 				}
 			}
-			goto __finally412;
-			__catch412_g_error:
+			goto __finally414;
+			__catch414_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"
 			}
-			__finally412:
+			__finally414:
 #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 __catch413_g_error;
+			goto __catch415_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 __finally413;
-	__catch413_g_error:
+	goto __finally415;
+	__catch415_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"
 	}
-	__finally413:
+	__finally415:
 #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 __catch414_g_error;
+			goto __catch416_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 __finally414;
-	__catch414_g_error:
+	goto __finally416;
+	__catch416_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"
 	}
-	__finally414:
+	__finally416:
 #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 __catch415_g_error;
+				goto __catch417_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 __finally415;
-		__catch415_g_error:
+		goto __finally417;
+		__catch417_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"
 		}
-		__finally415:
+		__finally417:
 #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 __catch416_g_error;
+			goto __catch418_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
 #line 15374 "BatchImport.c"
 	}
-	goto __finally416;
-	__catch416_g_error:
+	goto __finally418;
+	__catch418_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"
 	}
-	__finally416:
+	__finally418:
 #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 __catch417_g_error;
+				goto __catch419_g_error;
 			}
 		}
-		goto __finally417;
-		__catch417_g_error:
+		goto __finally419;
+		__catch419_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"
 		}
-		__finally417:
+		__finally419:
 #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 __catch418_g_error;
+				goto __catch420_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 __catch418_g_error;
+					goto __catch420_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 __finally418;
-		__catch418_g_error:
+		goto __finally420;
+		__catch420_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"
 		}
-		__finally418:
+		__finally420:
 #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 __catch419_g_error;
+				goto __catch421_g_error;
 			}
 		}
-		goto __finally419;
-		__catch419_g_error:
+		goto __finally421;
+		__catch421_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"
 		}
-		__finally419:
+		__finally421:
 #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 __catch420_g_error;
+			goto __catch422_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 __finally420;
-	__catch420_g_error:
+	goto __finally422;
+	__catch422_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"
 	}
-	__finally420:
+	__finally422:
 #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/BatchImport.vala b/src/BatchImport.vala
index 4a46a26..3febf08 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -271,7 +271,7 @@ public class BatchImportRoll {
 
 // A BatchImportResult associates a particular job with a File that an import was performed on
 // and the import result.  A BatchImportJob can specify multiple files, so there is not necessarily
-// a one-to-one relationship beteen it and this object.
+// a one-to-one relationship between it and this object.
 //
 // Note that job may be null (in the case of a pre-failed job that must be reported) and file may
 // be null (for similar reasons).
diff --git a/src/Box.c b/src/Box.c
index 0ebb6da..23734f3 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.32.1, the Vala compiler
+/* Box.c generated by valac 0.34.4, the Vala compiler
  * generated from Box.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index 7c3ab70..b5d30e5 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.32.1, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.34.4, the Vala compiler
  * generated from CheckerboardLayout.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -530,7 +530,7 @@ gchar* checkerboard_item_get_subtitle (CheckerboardItem* self);
 void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
 static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboolean visible);
 void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor);
-gboolean checkerboard_item_get_is_cusor (CheckerboardItem* self);
+gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self);
 static void checkerboard_item_real_notify_membership_changed (DataObject* base, DataCollection* collection);
 void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result);
 static void _vala_GValue_free (GValue* self);
@@ -1384,11 +1384,11 @@ void checkerboard_item_text_unref (gpointer instance) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1394 "CheckerboardLayout.c"
 	{
@@ -1403,98 +1403,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1425 "CheckerboardLayout.c"
-				goto __catch239_g_regex_error;
+				goto __catch241_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1434 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1450 "CheckerboardLayout.c"
-				goto __catch239_g_regex_error;
+				goto __catch241_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1461 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1475 "CheckerboardLayout.c"
 	}
-	goto __finally239;
-	__catch239_g_regex_error:
+	goto __finally241;
+	__catch241_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1489 "CheckerboardLayout.c"
 	}
-	__finally239:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally241:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1500 "CheckerboardLayout.c"
 	}
@@ -2445,7 +2445,7 @@ void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor
 }
 
 
-gboolean checkerboard_item_get_is_cusor (CheckerboardItem* self) {
+gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 #line 339 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -7296,15 +7296,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 7310 "CheckerboardLayout.c"
 }
@@ -7317,37 +7317,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 7333 "CheckerboardLayout.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 7341 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 7353 "CheckerboardLayout.c"
 	}
@@ -7367,112 +7367,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 7377 "CheckerboardLayout.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 7383 "CheckerboardLayout.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 7387 "CheckerboardLayout.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 7391 "CheckerboardLayout.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 7403 "CheckerboardLayout.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 7413 "CheckerboardLayout.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 7419 "CheckerboardLayout.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 7433 "CheckerboardLayout.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 7443 "CheckerboardLayout.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 7449 "CheckerboardLayout.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 7458 "CheckerboardLayout.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 7478 "CheckerboardLayout.c"
 }
diff --git a/src/CheckerboardLayout.vala b/src/CheckerboardLayout.vala
index f2acc30..5a672f3 100644
--- a/src/CheckerboardLayout.vala
+++ b/src/CheckerboardLayout.vala
@@ -336,7 +336,7 @@ public abstract class CheckerboardItem : ThumbnailView {
         this.is_cursor = is_cursor;
     }
 
-    public bool get_is_cusor() {
+    public bool get_is_cursor() {
         return is_cursor;
     }
     
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index c778508..afd1659 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.32.1, the Vala compiler
+/* CollectionPage.c generated by valac 0.34.4, the Vala compiler
  * generated from CollectionPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <float.h>
 #include <math.h>
 #include <glib/gi18n-lib.h>
@@ -311,16 +311,6 @@ 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))
@@ -341,6 +331,16 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass;
 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_VIDEO_SOURCE (video_source_get_type ())
 #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource))
 #define VIDEO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_SOURCE, VideoSourceClass))
@@ -750,7 +750,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -1160,10 +1161,10 @@ 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 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 void collection_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void collection_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
@@ -1189,6 +1190,8 @@ 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);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 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);
@@ -1383,7 +1386,7 @@ static const GActionEntry COLLECTION_PAGE_entries[16] = {{"Print", _collection_p
 static gpointer _g_object_ref0 (gpointer self) {
 #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1387 "CollectionPage.c"
+#line 1390 "CollectionPage.c"
 }
 
 
@@ -1405,14 +1408,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 1409 "CollectionPage.c"
+#line 1412 "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 1416 "CollectionPage.c"
+#line 1419 "CollectionPage.c"
 }
 
 
@@ -1436,7 +1439,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 1440 "CollectionPage.c"
+#line 1443 "CollectionPage.c"
 }
 
 
@@ -1449,14 +1452,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 1453 "CollectionPage.c"
+#line 1456 "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 1460 "CollectionPage.c"
+#line 1463 "CollectionPage.c"
 }
 
 
@@ -1468,7 +1471,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 1472 "CollectionPage.c"
+#line 1475 "CollectionPage.c"
 }
 
 
@@ -1487,126 +1490,126 @@ 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 1491 "CollectionPage.c"
+#line 1494 "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 1498 "CollectionPage.c"
+#line 1501 "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 1505 "CollectionPage.c"
+#line 1508 "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 1512 "CollectionPage.c"
+#line 1515 "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 1519 "CollectionPage.c"
+#line 1522 "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 1526 "CollectionPage.c"
+#line 1529 "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 1533 "CollectionPage.c"
+#line 1536 "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 1540 "CollectionPage.c"
+#line 1543 "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 1547 "CollectionPage.c"
+#line 1550 "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 1554 "CollectionPage.c"
+#line 1557 "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 1561 "CollectionPage.c"
+#line 1564 "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 1568 "CollectionPage.c"
+#line 1571 "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 1575 "CollectionPage.c"
+#line 1578 "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 1582 "CollectionPage.c"
+#line 1585 "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 1589 "CollectionPage.c"
+#line 1592 "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 1596 "CollectionPage.c"
+#line 1599 "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 1603 "CollectionPage.c"
+#line 1606 "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 1610 "CollectionPage.c"
+#line 1613 "CollectionPage.c"
 }
 
 
@@ -1647,7 +1650,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 1651 "CollectionPage.c"
+#line 1654 "CollectionPage.c"
 }
 
 
@@ -1663,7 +1666,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 1667 "CollectionPage.c"
+#line 1670 "CollectionPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		GtkSeparatorToolItem* separator = NULL;
@@ -1764,7 +1767,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 1768 "CollectionPage.c"
+#line 1771 "CollectionPage.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -1774,7 +1777,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	result = _tmp21_;
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1778 "CollectionPage.c"
+#line 1781 "CollectionPage.c"
 }
 
 
@@ -1812,7 +1815,7 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	result = group;
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1816 "CollectionPage.c"
+#line 1819 "CollectionPage.c"
 }
 
 
@@ -1833,7 +1836,7 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	result = group;
 #line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1837 "CollectionPage.c"
+#line 1840 "CollectionPage.c"
 }
 
 
@@ -1861,7 +1864,7 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	result = group;
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1865 "CollectionPage.c"
+#line 1868 "CollectionPage.c"
 }
 
 
@@ -1921,7 +1924,7 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	result = group;
 #line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1925 "CollectionPage.c"
+#line 1928 "CollectionPage.c"
 }
 
 
@@ -1942,7 +1945,7 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 	result = group;
 #line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1946 "CollectionPage.c"
+#line 1949 "CollectionPage.c"
 }
 
 
@@ -1973,7 +1976,7 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	result = group;
 #line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1977 "CollectionPage.c"
+#line 1980 "CollectionPage.c"
 }
 
 
@@ -1993,129 +1996,176 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	_tmp1_ = ui_filenames;
 #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 1997 "CollectionPage.c"
+#line 2000 "CollectionPage.c"
 }
 
 
-static void collection_page_real_add_actions (Page* base) {
+static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
+#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #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"
-	_tmp0_ = app_window_get_instance ();
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#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), _tmp0_);
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	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);
+	_tmp1_ = map;
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 2017 "CollectionPage.c"
+	g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
+#line 2020 "CollectionPage.c"
 }
 
 
-static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
+	CollectionPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = map;
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
+#line 2035 "CollectionPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		entry_collection = COLLECTION_PAGE_entries;
+#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
+#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) {
+#line 2047 "CollectionPage.c"
+			GActionEntry entry = {0};
+#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			entry = entry_collection[entry_it];
+#line 2051 "CollectionPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
+				_tmp1_ = map;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
+				_tmp2_ = entry;
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp3_ = _tmp2_.name;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 2064 "CollectionPage.c"
+			}
+		}
+	}
+}
+
+
+static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if ((*length) == (*size)) {
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2028 "CollectionPage.c"
+#line 2078 "CollectionPage.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2034 "CollectionPage.c"
+#line 2084 "CollectionPage.c"
 }
 
 
 static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2045 "CollectionPage.c"
+#line 2095 "CollectionPage.c"
 	}
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2051 "CollectionPage.c"
+#line 2101 "CollectionPage.c"
 }
 
 
 static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2062 "CollectionPage.c"
+#line 2112 "CollectionPage.c"
 	}
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2068 "CollectionPage.c"
+#line 2118 "CollectionPage.c"
 }
 
 
 static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2079 "CollectionPage.c"
+#line 2129 "CollectionPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2085 "CollectionPage.c"
+#line 2135 "CollectionPage.c"
 }
 
 
 static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2096 "CollectionPage.c"
+#line 2146 "CollectionPage.c"
 	}
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2102 "CollectionPage.c"
+#line 2152 "CollectionPage.c"
 }
 
 
 static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2113 "CollectionPage.c"
+#line 2163 "CollectionPage.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2119 "CollectionPage.c"
+#line 2169 "CollectionPage.c"
 }
 
 
@@ -2147,79 +2197,79 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/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 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups_length1 = _tmp0_;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_groups_size_ = groups_length1;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = groups;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2__length1 = groups_length1;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/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"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
-#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 190 "/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"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6__length1 = groups_length1;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 191 "/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"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
-#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/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"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10__length1 = groups_length1;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/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"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 194 "/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"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (result_length1) {
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2217 "CollectionPage.c"
+#line 2267 "CollectionPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2223 "CollectionPage.c"
+#line 2273 "CollectionPage.c"
 }
 
 
@@ -2231,29 +2281,29 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_video (_tmp3_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2257 "CollectionPage.c"
+#line 2307 "CollectionPage.c"
 }
 
 
@@ -2265,29 +2315,29 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_sources (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2291 "CollectionPage.c"
+#line 2341 "CollectionPage.c"
 }
 
 
@@ -2299,29 +2349,29 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2325 "CollectionPage.c"
+#line 2375 "CollectionPage.c"
 }
 
 
@@ -2329,29 +2379,29 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	CollectionPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = selected_count;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = count;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 212 "/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 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/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 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 215 "/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 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 216 "/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 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", TRUE);
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
-#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2355 "CollectionPage.c"
+#line 2405 "CollectionPage.c"
 }
 
 
@@ -2413,49 +2463,49 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	gboolean _tmp92_ = FALSE;
 	gboolean _tmp93_ = FALSE;
 	gboolean _tmp95_ = FALSE;
-#line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 224 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/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"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/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"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2437 "CollectionPage.c"
+#line 2487 "CollectionPage.c"
 	}
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = count;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 230 "/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"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = selected_count;
-#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	one_selected = _tmp7_ == 1;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = selected_count;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_selected = _tmp8_ > 0;
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	primary_is_video = FALSE;
-#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = has_selected;
-#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2459 "CollectionPage.c"
+#line 2509 "CollectionPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		DataView* _tmp12_ = NULL;
@@ -2463,116 +2513,116 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp14_ = NULL;
 		DataSource* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/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"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = data_view_get_source (_tmp13_);
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/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"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp16_) {
-#line 231 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2491 "CollectionPage.c"
+#line 2541 "CollectionPage.c"
 		}
 	}
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = collection_page_selection_has_video (self);
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selection_has_videos = _tmp17_;
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp18_ = collection_page_page_has_photo (self);
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_has_photos = _tmp18_;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = has_selected;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2506 "CollectionPage.c"
+#line 2556 "CollectionPage.c"
 		gboolean _tmp21_ = FALSE;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2512 "CollectionPage.c"
+#line 2562 "CollectionPage.c"
 	} else {
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2516 "CollectionPage.c"
+#line 2566 "CollectionPage.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 245 "/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"
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = primary_is_video;
-#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 246 "/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"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = one_selected;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp24_) {
-#line 2528 "CollectionPage.c"
+#line 2578 "CollectionPage.c"
 		ConfigFacade* _tmp25_ = NULL;
 		ConfigFacade* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = config_facade_get_instance ();
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = _tmp25_;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/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"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp28_ = _tmp27_;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp29_ = is_string_empty (_tmp28_);
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp28_);
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2550 "CollectionPage.c"
+#line 2600 "CollectionPage.c"
 	} else {
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = FALSE;
-#line 2554 "CollectionPage.c"
+#line 2604 "CollectionPage.c"
 	}
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/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"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = one_selected;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp33_) {
-#line 2562 "CollectionPage.c"
+#line 2612 "CollectionPage.c"
 		gboolean _tmp34_ = FALSE;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp34_ = primary_is_video;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = !_tmp34_;
-#line 2568 "CollectionPage.c"
+#line 2618 "CollectionPage.c"
 	} else {
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = FALSE;
-#line 2572 "CollectionPage.c"
+#line 2622 "CollectionPage.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_) {
-#line 2576 "CollectionPage.c"
+#line 2626 "CollectionPage.c"
 		ViewCollection* _tmp35_ = NULL;
 		ViewCollection* _tmp36_ = NULL;
 		DataView* _tmp37_ = NULL;
@@ -2580,121 +2630,121 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp39_ = NULL;
 		Photo* _tmp40_ = NULL;
 		PhotoFileFormat _tmp41_ = 0;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/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"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp36_ = _tmp35_;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp37_ = view_collection_get_selected_at (_tmp36_, 0);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp38_ = _tmp37_;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp39_ = data_view_get_source (_tmp38_);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/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"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = photo_get_master_file_format (_tmp40_);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = _tmp41_ == PHOTO_FILE_FORMAT_RAW;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp40_);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp38_);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp36_);
-#line 2606 "CollectionPage.c"
+#line 2656 "CollectionPage.c"
 	} else {
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = FALSE;
-#line 2610 "CollectionPage.c"
+#line 2660 "CollectionPage.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_) {
-#line 2614 "CollectionPage.c"
+#line 2664 "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"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = config_facade_get_instance ();
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/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"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = _tmp44_;
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = is_string_empty (_tmp45_);
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = !_tmp46_;
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp45_);
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 2636 "CollectionPage.c"
+#line 2686 "CollectionPage.c"
 	} else {
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = FALSE;
-#line 2640 "CollectionPage.c"
+#line 2690 "CollectionPage.c"
 	}
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 249 "/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"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp48_ = selection_has_videos;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp48_) {
-#line 2648 "CollectionPage.c"
+#line 2698 "CollectionPage.c"
 		gboolean _tmp49_ = FALSE;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = collection_page_can_revert_selected (self);
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = _tmp49_;
-#line 2654 "CollectionPage.c"
+#line 2704 "CollectionPage.c"
 	} else {
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = FALSE;
-#line 2658 "CollectionPage.c"
+#line 2708 "CollectionPage.c"
 	}
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/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"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp51_ = selection_has_videos;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp51_) {
-#line 2666 "CollectionPage.c"
+#line 2716 "CollectionPage.c"
 		gboolean _tmp52_ = FALSE;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp52_ = has_selected;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp52_;
-#line 2672 "CollectionPage.c"
+#line 2722 "CollectionPage.c"
 	} else {
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = FALSE;
-#line 2676 "CollectionPage.c"
+#line 2726 "CollectionPage.c"
 	}
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 255 "/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"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp55_ = selection_has_videos;
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp55_) {
-#line 2684 "CollectionPage.c"
+#line 2734 "CollectionPage.c"
 		gboolean _tmp56_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = one_selected;
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp56_;
-#line 2690 "CollectionPage.c"
+#line 2740 "CollectionPage.c"
 	} else {
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = FALSE;
-#line 2694 "CollectionPage.c"
+#line 2744 "CollectionPage.c"
 	}
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp54_) {
-#line 2698 "CollectionPage.c"
+#line 2748 "CollectionPage.c"
 		ViewCollection* _tmp57_ = NULL;
 		ViewCollection* _tmp58_ = NULL;
 		DataView* _tmp59_ = NULL;
@@ -2702,259 +2752,259 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp61_ = NULL;
 		Photo* _tmp62_ = NULL;
 		gboolean _tmp63_ = FALSE;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/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"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = view_collection_get_selected_at (_tmp58_, 0);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = data_view_get_source (_tmp60_);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/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"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp63_ = photo_has_color_adjustments (_tmp62_);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = _tmp63_;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp62_);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp58_);
-#line 2728 "CollectionPage.c"
+#line 2778 "CollectionPage.c"
 	} else {
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = FALSE;
-#line 2732 "CollectionPage.c"
+#line 2782 "CollectionPage.c"
 	}
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/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"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp66_ = selection_has_videos;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp66_) {
-#line 2740 "CollectionPage.c"
+#line 2790 "CollectionPage.c"
 		gboolean _tmp67_ = FALSE;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp67_ = has_selected;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = _tmp67_;
-#line 2746 "CollectionPage.c"
+#line 2796 "CollectionPage.c"
 	} else {
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = FALSE;
-#line 2750 "CollectionPage.c"
+#line 2800 "CollectionPage.c"
 	}
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp65_) {
-#line 2754 "CollectionPage.c"
+#line 2804 "CollectionPage.c"
 		gboolean _tmp68_ = FALSE;
-#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = _tmp68_;
-#line 2760 "CollectionPage.c"
+#line 2810 "CollectionPage.c"
 	} else {
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 2764 "CollectionPage.c"
+#line 2814 "CollectionPage.c"
 	}
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 258 "/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"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp70_ = selection_has_videos;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp70_) {
-#line 2772 "CollectionPage.c"
+#line 2822 "CollectionPage.c"
 		gboolean _tmp71_ = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp71_ = has_selected;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = _tmp71_;
-#line 2778 "CollectionPage.c"
+#line 2828 "CollectionPage.c"
 	} else {
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = FALSE;
-#line 2782 "CollectionPage.c"
+#line 2832 "CollectionPage.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/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"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp73_ = selection_has_videos;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp73_) {
-#line 2790 "CollectionPage.c"
+#line 2840 "CollectionPage.c"
 		gboolean _tmp74_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp74_ = has_selected;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = _tmp74_;
-#line 2796 "CollectionPage.c"
+#line 2846 "CollectionPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = FALSE;
-#line 2800 "CollectionPage.c"
+#line 2850 "CollectionPage.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/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"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp76_ = selection_has_videos;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp76_) {
-#line 2808 "CollectionPage.c"
+#line 2858 "CollectionPage.c"
 		gboolean _tmp77_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp77_ = has_selected;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = _tmp77_;
-#line 2814 "CollectionPage.c"
+#line 2864 "CollectionPage.c"
 	} else {
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = FALSE;
-#line 2818 "CollectionPage.c"
+#line 2868 "CollectionPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/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"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp79_ = selection_has_videos;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp79_) {
-#line 2826 "CollectionPage.c"
+#line 2876 "CollectionPage.c"
 		gboolean _tmp80_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp80_ = has_selected;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = _tmp80_;
-#line 2832 "CollectionPage.c"
+#line 2882 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = FALSE;
-#line 2836 "CollectionPage.c"
+#line 2886 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/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"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = has_selected;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/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"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = has_selected;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/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"
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = has_selected;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 270 "/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"
+#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = one_selected;
-#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 271 "/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"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = page_has_photos;
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp86_) {
-#line 2860 "CollectionPage.c"
+#line 2910 "CollectionPage.c"
 		gboolean _tmp87_ = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp87_ = primary_is_video;
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = !_tmp87_;
-#line 2866 "CollectionPage.c"
+#line 2916 "CollectionPage.c"
 	} else {
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = FALSE;
-#line 2870 "CollectionPage.c"
+#line 2920 "CollectionPage.c"
 	}
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 272 "/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"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = selection_has_videos;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp89_) {
-#line 2878 "CollectionPage.c"
+#line 2928 "CollectionPage.c"
 		gboolean _tmp90_ = FALSE;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp90_ = has_selected;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = _tmp90_;
-#line 2884 "CollectionPage.c"
+#line 2934 "CollectionPage.c"
 	} else {
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = FALSE;
-#line 2888 "CollectionPage.c"
+#line 2938 "CollectionPage.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/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"
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = has_selected;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 274 "/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"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp93_ = selection_has_videos;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp93_) {
-#line 2900 "CollectionPage.c"
+#line 2950 "CollectionPage.c"
 		gboolean _tmp94_ = FALSE;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp94_ = has_selected;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = _tmp94_;
-#line 2906 "CollectionPage.c"
+#line 2956 "CollectionPage.c"
 	} else {
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = FALSE;
-#line 2910 "CollectionPage.c"
+#line 2960 "CollectionPage.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/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"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp95_ = has_selected;
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp95_) {
-#line 2918 "CollectionPage.c"
+#line 2968 "CollectionPage.c"
 		const gchar* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gchar* label = NULL;
 		gchar* _tmp98_ = NULL;
 		const gchar* _tmp99_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		g_debug ("CollectionPage.vala:271: Setting action label for SetBackground...");
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		g_debug ("CollectionPage.vala:278: Setting action label for SetBackground...");
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp97_ = one_selected;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp97_) {
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 2932 "CollectionPage.c"
+#line 2982 "CollectionPage.c"
 		} else {
-#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 2936 "CollectionPage.c"
+#line 2986 "CollectionPage.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp98_ = g_strdup (_tmp96_);
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		label = _tmp98_;
-#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp99_ = label;
-#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_);
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (label);
-#line 2948 "CollectionPage.c"
+#line 2998 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 2958 "CollectionPage.c"
+#line 3008 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -2963,25 +3013,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 2985 "CollectionPage.c"
+#line 3035 "CollectionPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3001,120 +3051,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_ = FALSE;
 			LibraryPhoto* _tmp25_ = NULL;
 			gboolean _tmp26_ = FALSE;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3013 "CollectionPage.c"
+#line 3063 "CollectionPage.c"
 			}
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3035 "CollectionPage.c"
+#line 3085 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
 				gpointer _tmp17_ = NULL;
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3056 "CollectionPage.c"
+#line 3106 "CollectionPage.c"
 			}
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3066 "CollectionPage.c"
+#line 3116 "CollectionPage.c"
 			}
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3078 "CollectionPage.c"
+#line 3128 "CollectionPage.c"
 			}
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3094 "CollectionPage.c"
+#line 3144 "CollectionPage.c"
 			}
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3114 "CollectionPage.c"
+#line 3164 "CollectionPage.c"
 		}
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3118 "CollectionPage.c"
+#line 3168 "CollectionPage.c"
 	}
 }
 
@@ -3124,48 +3174,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3142 "CollectionPage.c"
+#line 3192 "CollectionPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3169 "CollectionPage.c"
+#line 3219 "CollectionPage.c"
 	}
 }
 
@@ -3178,52 +3228,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3200 "CollectionPage.c"
+#line 3250 "CollectionPage.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/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 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3219 "CollectionPage.c"
+#line 3269 "CollectionPage.c"
 	} else {
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3223 "CollectionPage.c"
+#line 3273 "CollectionPage.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3227 "CollectionPage.c"
+#line 3277 "CollectionPage.c"
 }
 
 
@@ -3245,162 +3295,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
 	CheckerboardPageActivator _tmp13_ = 0;
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3279 "CollectionPage.c"
+#line 3329 "CollectionPage.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3291 "CollectionPage.c"
+#line 3341 "CollectionPage.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3305 "CollectionPage.c"
+#line 3355 "CollectionPage.c"
 	}
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:337: activating %s", _tmp12_);
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_debug ("CollectionPage.vala:344: activating %s", _tmp12_);
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (_tmp12_);
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3321 "CollectionPage.c"
+#line 3371 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
 		gboolean _tmp15_ = FALSE;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3332 "CollectionPage.c"
+#line 3382 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_ = NULL;
 			LibraryWindow* _tmp17_ = NULL;
 			LibraryPhoto* _tmp18_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/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 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3347 "CollectionPage.c"
+#line 3397 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_ = 0;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3355 "CollectionPage.c"
+#line 3405 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
 			gboolean _tmp22_ = FALSE;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3365 "CollectionPage.c"
+#line 3415 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
 				gboolean _tmp24_ = FALSE;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3374 "CollectionPage.c"
+#line 3424 "CollectionPage.c"
 			} else {
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3378 "CollectionPage.c"
+#line 3428 "CollectionPage.c"
 			}
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3382 "CollectionPage.c"
+#line 3432 "CollectionPage.c"
 				LibraryWindow* _tmp25_ = NULL;
 				LibraryWindow* _tmp26_ = NULL;
 				LibraryPhoto* _tmp27_ = NULL;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/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 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3396 "CollectionPage.c"
+#line 3446 "CollectionPage.c"
 			}
 		}
 	}
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3404 "CollectionPage.c"
+#line 3454 "CollectionPage.c"
 }
 
 
@@ -3413,133 +3463,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 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3437 "CollectionPage.c"
+#line 3487 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/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 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3460 "CollectionPage.c"
+#line 3510 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 361 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 361 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 368 "/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 362 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3471 "CollectionPage.c"
+#line 3521 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3477 "CollectionPage.c"
+#line 3527 "CollectionPage.c"
 			default:
 			{
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 366 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3484 "CollectionPage.c"
+#line 3534 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3490 "CollectionPage.c"
+#line 3540 "CollectionPage.c"
 			default:
 			{
-#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 370 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3497 "CollectionPage.c"
+#line 3547 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3503 "CollectionPage.c"
+#line 3553 "CollectionPage.c"
 			default:
 			{
-#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3510 "CollectionPage.c"
+#line 3560 "CollectionPage.c"
 			}
 		}
 	}
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3520 "CollectionPage.c"
+#line 3570 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/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 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3530 "CollectionPage.c"
+#line 3580 "CollectionPage.c"
 	}
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3536 "CollectionPage.c"
+#line 3586 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3543 "CollectionPage.c"
+#line 3593 "CollectionPage.c"
 }
 
 
@@ -3595,233 +3645,233 @@ static void collection_page_real_on_export (MediaPage* base) {
 	ExporterUI* _tmp90_ = NULL;
 	ExporterUI* _tmp91_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3607 "CollectionPage.c"
+#line 3657 "CollectionPage.c"
 	}
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3633 "CollectionPage.c"
+#line 3683 "CollectionPage.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3649 "CollectionPage.c"
+#line 3699 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3656 "CollectionPage.c"
+#line 3706 "CollectionPage.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3664 "CollectionPage.c"
+#line 3714 "CollectionPage.c"
 		GeeCollection* _tmp14_ = NULL;
 		ExporterUI* _tmp15_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/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 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3679 "CollectionPage.c"
+#line 3729 "CollectionPage.c"
 	}
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 401 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 401 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3687 "CollectionPage.c"
+#line 3737 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
 		GeeCollection* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gchar* _tmp23_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 3701 "CollectionPage.c"
+#line 3751 "CollectionPage.c"
 			const gchar* _tmp21_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = _ ("Export Photo/Video");
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp21_;
-#line 3707 "CollectionPage.c"
+#line 3757 "CollectionPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _ ("Export Photos/Videos");
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp22_;
-#line 3714 "CollectionPage.c"
+#line 3764 "CollectionPage.c"
 		}
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = g_strdup (_tmp17_);
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp23_;
-#line 3722 "CollectionPage.c"
+#line 3772 "CollectionPage.c"
 	} else {
 		const gchar* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gchar* _tmp30_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = export_list;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = _tmp26_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp27_ == 1) {
-#line 3737 "CollectionPage.c"
+#line 3787 "CollectionPage.c"
 			const gchar* _tmp28_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp28_ = _ ("Export Photo");
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp28_;
-#line 3743 "CollectionPage.c"
+#line 3793 "CollectionPage.c"
 		} else {
 			const gchar* _tmp29_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp29_ = _ ("Export Photos");
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp29_;
-#line 3750 "CollectionPage.c"
+#line 3800 "CollectionPage.c"
 		}
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = g_strdup (_tmp24_);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp30_;
-#line 3758 "CollectionPage.c"
+#line 3808 "CollectionPage.c"
 	}
-#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = title;
-#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = export_dialog_new (_tmp31_);
-#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp32_);
-#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dialog = _tmp32_;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = has_some_videos;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp34_) {
-#line 3772 "CollectionPage.c"
+#line 3822 "CollectionPage.c"
 		ExportFormatParameters _tmp35_ = {0};
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_current (&_tmp35_);
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp35_;
-#line 3778 "CollectionPage.c"
+#line 3828 "CollectionPage.c"
 	} else {
 		ExportFormatParameters _tmp36_ = {0};
-#line 416 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_last (&_tmp36_);
-#line 416 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp36_;
-#line 3785 "CollectionPage.c"
+#line 3835 "CollectionPage.c"
 	}
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_params = _tmp33_;
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = export_dialog;
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scale = _tmp38_;
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	constraint = _tmp39_;
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp40_) {
-#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3807 "CollectionPage.c"
+#line 3857 "CollectionPage.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp41_ = constraint;
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp42_ = scale;
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling = _tmp43_;
-#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp44_ = export_list;
-#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp45_ = gee_collection_get_size (_tmp44_);
-#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp46_ = _tmp45_;
-#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp46_ == 1) {
-#line 3825 "CollectionPage.c"
+#line 3875 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
 		LibraryPhoto* _tmp55_ = NULL;
@@ -3831,22 +3881,22 @@ static void collection_page_real_on_export (MediaPage* base) {
 		GFile* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		GFile* _tmp61_ = NULL;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3837 "CollectionPage.c"
+#line 3887 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
 			GeeCollection* _tmp47_ = NULL;
 			GeeIterator* _tmp48_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp47_ = export_list;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/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 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_p_it = _tmp48_;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3850 "CollectionPage.c"
+#line 3900 "CollectionPage.c"
 				GeeIterator* _tmp49_ = NULL;
 				gboolean _tmp50_ = FALSE;
 				LibraryPhoto* p = NULL;
@@ -3854,73 +3904,73 @@ static void collection_page_real_on_export (MediaPage* base) {
 				gpointer _tmp52_ = NULL;
 				LibraryPhoto* _tmp53_ = NULL;
 				LibraryPhoto* _tmp54_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp49_ = _p_it;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp50_ = gee_iterator_next (_tmp49_);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!_tmp50_) {
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3866 "CollectionPage.c"
+#line 3916 "CollectionPage.c"
 				}
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp51_ = _p_it;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp52_ = gee_iterator_get (_tmp51_);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				p = (LibraryPhoto*) _tmp52_;
-#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp53_ = p;
-#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp54_ = _g_object_ref0 (_tmp53_);
-#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo = _tmp54_;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3886 "CollectionPage.c"
+#line 3936 "CollectionPage.c"
 			}
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3890 "CollectionPage.c"
+#line 3940 "CollectionPage.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp55_ = photo;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = export_params;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/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 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = export_ui_choose_file (_tmp58_);
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp58_);
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		save_as = _tmp60_;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = save_as;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp61_ == NULL) {
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 3924 "CollectionPage.c"
+#line 3974 "CollectionPage.c"
 		}
 		{
 			AppWindow* _tmp62_ = NULL;
@@ -3939,191 +3989,191 @@ static void collection_page_real_on_export (MediaPage* base) {
 			gboolean _tmp75_ = FALSE;
 			AppWindow* _tmp76_ = NULL;
 			AppWindow* _tmp77_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp62_ = app_window_get_instance ();
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp63_ = _tmp62_;
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp63_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp64_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp65_ = save_as;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = scaling;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp67_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = _tmp67_.quality;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp69_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp70_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/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 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp72_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp73_ = _tmp72_.mode;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp74_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp75_ = _tmp74_.export_metadata;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/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 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3979 "CollectionPage.c"
-				goto __catch230_g_error;
+#line 4029 "CollectionPage.c"
+				goto __catch232_g_error;
 			}
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp77_ = _tmp76_;
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp77_);
-#line 3990 "CollectionPage.c"
+#line 4040 "CollectionPage.c"
 		}
-		goto __finally230;
-		__catch230_g_error:
+		goto __finally232;
+		__catch232_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp78_ = NULL;
 			AppWindow* _tmp79_ = NULL;
 			GFile* _tmp80_ = NULL;
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_inner_error_ = NULL;
 #line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_inner_error_ = NULL;
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp78_ = app_window_get_instance ();
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp79_ = _tmp78_;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp79_);
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp80_ = save_as;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			export_error_dialog (_tmp80_, FALSE);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4017 "CollectionPage.c"
+#line 4067 "CollectionPage.c"
 		}
-		__finally230:
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		__finally232:
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/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 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4038 "CollectionPage.c"
+#line 4088 "CollectionPage.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4052 "CollectionPage.c"
+#line 4102 "CollectionPage.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = title;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = export_ui_choose_dir (_tmp81_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dir = _tmp82_;
-#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = export_dir;
-#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp83_ == NULL) {
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4074 "CollectionPage.c"
+#line 4124 "CollectionPage.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = export_list;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp85_ = export_dir;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = scaling;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp87_ = export_params;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = _tmp88_;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp90_ = exporter_ui_new (_tmp89_);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = _tmp90_;
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp89_);
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = self->priv->exporter;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4108 "CollectionPage.c"
+#line 4158 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4119 "CollectionPage.c"
+#line 4169 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4127 "CollectionPage.c"
+#line 4177 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4135,31 +4185,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4163 "CollectionPage.c"
+#line 4213 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4172,107 +4222,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4188 "CollectionPage.c"
+#line 4238 "CollectionPage.c"
 			}
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4208 "CollectionPage.c"
+#line 4258 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4220 "CollectionPage.c"
+#line 4270 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_ = NULL;
 					gboolean _tmp21_ = FALSE;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4230 "CollectionPage.c"
+#line 4280 "CollectionPage.c"
 				}
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4234 "CollectionPage.c"
+#line 4284 "CollectionPage.c"
 			} else {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4238 "CollectionPage.c"
+#line 4288 "CollectionPage.c"
 			}
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4252 "CollectionPage.c"
+#line 4302 "CollectionPage.c"
 			}
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4258 "CollectionPage.c"
+#line 4308 "CollectionPage.c"
 		}
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4262 "CollectionPage.c"
+#line 4312 "CollectionPage.c"
 	}
-#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4268 "CollectionPage.c"
+#line 4318 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4276 "CollectionPage.c"
+#line 4326 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4284,31 +4334,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4312 "CollectionPage.c"
+#line 4362 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4321,82 +4371,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4337 "CollectionPage.c"
+#line 4387 "CollectionPage.c"
 			}
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4357 "CollectionPage.c"
+#line 4407 "CollectionPage.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4366 "CollectionPage.c"
+#line 4416 "CollectionPage.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4370 "CollectionPage.c"
+#line 4420 "CollectionPage.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4384 "CollectionPage.c"
+#line 4434 "CollectionPage.c"
 			}
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4390 "CollectionPage.c"
+#line 4440 "CollectionPage.c"
 		}
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4394 "CollectionPage.c"
+#line 4444 "CollectionPage.c"
 	}
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4400 "CollectionPage.c"
+#line 4450 "CollectionPage.c"
 }
 
 
@@ -4417,59 +4467,59 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4437 "CollectionPage.c"
+#line 4487 "CollectionPage.c"
 	}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/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 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4473 "CollectionPage.c"
+#line 4523 "CollectionPage.c"
 }
 
 
@@ -4478,40 +4528,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4496 "CollectionPage.c"
+#line 4546 "CollectionPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4515 "CollectionPage.c"
+#line 4565 "CollectionPage.c"
 	}
 }
 
@@ -4533,59 +4583,59 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4553 "CollectionPage.c"
+#line 4603 "CollectionPage.c"
 	}
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/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 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 501 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4589 "CollectionPage.c"
+#line 4639 "CollectionPage.c"
 }
 
 
@@ -4606,59 +4656,59 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4626 "CollectionPage.c"
+#line 4676 "CollectionPage.c"
 	}
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Horizontally");
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/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 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4662 "CollectionPage.c"
+#line 4712 "CollectionPage.c"
 }
 
 
@@ -4679,59 +4729,59 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4699 "CollectionPage.c"
+#line 4749 "CollectionPage.c"
 	}
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Vertically");
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Vertically");
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/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 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4735 "CollectionPage.c"
+#line 4785 "CollectionPage.c"
 }
 
 
@@ -4751,29 +4801,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_ = NULL;
 	CommandManager* _tmp34_ = NULL;
 	RevertMultipleCommand* _tmp35_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4771 "CollectionPage.c"
+#line 4821 "CollectionPage.c"
 	}
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4777 "CollectionPage.c"
+#line 4827 "CollectionPage.c"
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -4782,33 +4832,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4812 "CollectionPage.c"
+#line 4862 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -4821,31 +4871,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gint _object_index = 0;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4849 "CollectionPage.c"
+#line 4899 "CollectionPage.c"
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -4854,72 +4904,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_ = 0;
 				gpointer _tmp25_ = NULL;
 				DataObject* _tmp26_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4870 "CollectionPage.c"
+#line 4920 "CollectionPage.c"
 				}
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4886 "CollectionPage.c"
+#line 4936 "CollectionPage.c"
 			}
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4890 "CollectionPage.c"
+#line 4940 "CollectionPage.c"
 		}
 	}
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4923 "CollectionPage.c"
+#line 4973 "CollectionPage.c"
 }
 
 
@@ -4938,57 +4988,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
 	PixelTransformationBundle* _tmp12_ = NULL;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 556 "/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 557 "/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 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4958 "CollectionPage.c"
+#line 5008 "CollectionPage.c"
 	}
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 4992 "CollectionPage.c"
+#line 5042 "CollectionPage.c"
 }
 
 
@@ -5011,78 +5061,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_ = NULL;
 	CommandManager* _tmp15_ = NULL;
 	AdjustColorsMultipleCommand* _tmp16_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5035 "CollectionPage.c"
+#line 5085 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5042 "CollectionPage.c"
+#line 5092 "CollectionPage.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5050 "CollectionPage.c"
+#line 5100 "CollectionPage.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/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 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5086 "CollectionPage.c"
+#line 5136 "CollectionPage.c"
 }
 
 
@@ -5101,55 +5151,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	EnhanceMultipleCommand* _tmp12_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5121 "CollectionPage.c"
+#line 5171 "CollectionPage.c"
 	}
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5153 "CollectionPage.c"
+#line 5203 "CollectionPage.c"
 }
 
 
@@ -5168,55 +5218,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 582 "/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 583 "/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 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5188 "CollectionPage.c"
+#line 5238 "CollectionPage.c"
 	}
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/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 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5220 "CollectionPage.c"
+#line 5270 "CollectionPage.c"
 }
 
 
@@ -5251,29 +5301,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5271 "CollectionPage.c"
+#line 5321 "CollectionPage.c"
 	}
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5277 "CollectionPage.c"
+#line 5327 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -5285,31 +5335,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _dv_index = 0;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5313 "CollectionPage.c"
+#line 5363 "CollectionPage.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5321,109 +5371,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_ = NULL;
 			DataSource* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5337 "CollectionPage.c"
+#line 5387 "CollectionPage.c"
 			}
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5361 "CollectionPage.c"
+#line 5411 "CollectionPage.c"
 			} else {
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5365 "CollectionPage.c"
+#line 5415 "CollectionPage.c"
 			}
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5369 "CollectionPage.c"
+#line 5419 "CollectionPage.c"
 		}
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5373 "CollectionPage.c"
+#line 5423 "CollectionPage.c"
 	}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5427 "CollectionPage.c"
+#line 5477 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
@@ -5437,49 +5487,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_ = NULL;
 		CommandManager* _tmp50_ = NULL;
 		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/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 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5477 "CollectionPage.c"
+#line 5527 "CollectionPage.c"
 	}
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5483 "CollectionPage.c"
+#line 5533 "CollectionPage.c"
 }
 
 
@@ -5496,122 +5546,122 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_ = NULL;
 	Photo* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5516 "CollectionPage.c"
+#line 5566 "CollectionPage.c"
 	}
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5536 "CollectionPage.c"
+#line 5586 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		AppWindow* _tmp13_ = NULL;
 		AppWindow* _tmp14_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5557 "CollectionPage.c"
-			goto __catch231_g_error;
+#line 5607 "CollectionPage.c"
+			goto __catch233_g_error;
 		}
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5568 "CollectionPage.c"
+#line 5618 "CollectionPage.c"
 	}
-	goto __finally231;
-	__catch231_g_error:
+	goto __finally233;
+	__catch233_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5598 "CollectionPage.c"
+#line 5648 "CollectionPage.c"
 	}
-	__finally231:
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally233:
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/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 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5611 "CollectionPage.c"
+#line 5661 "CollectionPage.c"
 	}
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5615 "CollectionPage.c"
+#line 5665 "CollectionPage.c"
 }
 
 
@@ -5630,53 +5680,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PhotoFileFormat _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5650 "CollectionPage.c"
+#line 5700 "CollectionPage.c"
 	}
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5680 "CollectionPage.c"
+#line 5730 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_ = NULL;
@@ -5684,35 +5734,35 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_ = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5702 "CollectionPage.c"
-			goto __catch232_g_error;
+#line 5752 "CollectionPage.c"
+			goto __catch234_g_error;
 		}
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5713 "CollectionPage.c"
+#line 5763 "CollectionPage.c"
 	}
-	goto __finally232;
-	__catch232_g_error:
+	goto __finally234;
+	__catch234_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_ = NULL;
@@ -5720,48 +5770,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5748 "CollectionPage.c"
+#line 5798 "CollectionPage.c"
 	}
-	__finally232:
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally234:
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/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 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5761 "CollectionPage.c"
+#line 5811 "CollectionPage.c"
 	}
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5765 "CollectionPage.c"
+#line 5815 "CollectionPage.c"
 }
 
 
@@ -5778,60 +5828,60 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/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 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/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 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5812 "CollectionPage.c"
+#line 5862 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_ = NULL;
 		SetBackgroundPhotoDialog* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_object_ref_sink (_tmp9_);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5835 "CollectionPage.c"
+#line 5885 "CollectionPage.c"
 			AppWindow* _tmp14_ = NULL;
 			AppWindow* _tmp15_ = NULL;
 			GeeArrayList* _tmp16_ = NULL;
@@ -5841,54 +5891,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_ = FALSE;
 			AppWindow* _tmp21_ = NULL;
 			AppWindow* _tmp22_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/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 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5875 "CollectionPage.c"
+#line 5925 "CollectionPage.c"
 		}
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (dialog);
-#line 5879 "CollectionPage.c"
+#line 5929 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5892 "CollectionPage.c"
+#line 5942 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
 			gint delay = 0;
@@ -5897,25 +5947,25 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_object_ref_sink (_tmp26_);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 5919 "CollectionPage.c"
+#line 5969 "CollectionPage.c"
 				AppWindow* _tmp32_ = NULL;
 				AppWindow* _tmp33_ = NULL;
 				GeeArrayList* _tmp34_ = NULL;
@@ -5924,42 +5974,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_ = FALSE;
 				AppWindow* _tmp38_ = NULL;
 				AppWindow* _tmp39_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/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 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 5954 "CollectionPage.c"
+#line 6004 "CollectionPage.c"
 			}
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dialog);
-#line 5958 "CollectionPage.c"
+#line 6008 "CollectionPage.c"
 		}
 	}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 5963 "CollectionPage.c"
+#line 6013 "CollectionPage.c"
 }
 
 
@@ -5999,205 +6049,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_ = NULL;
 	SlideshowPage* _tmp39_ = NULL;
 	SlideshowPage* _tmp40_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6019 "CollectionPage.c"
+#line 6069 "CollectionPage.c"
 	}
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6033 "CollectionPage.c"
+#line 6083 "CollectionPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		GeeList* _tmp11_ = NULL;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6049 "CollectionPage.c"
+#line 6099 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		GeeList* _tmp14_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6066 "CollectionPage.c"
+#line 6116 "CollectionPage.c"
 	}
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6078 "CollectionPage.c"
+#line 6128 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6091 "CollectionPage.c"
+#line 6141 "CollectionPage.c"
 	}
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6101 "CollectionPage.c"
+#line 6151 "CollectionPage.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6135 "CollectionPage.c"
+#line 6185 "CollectionPage.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6147 "CollectionPage.c"
+#line 6197 "CollectionPage.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6165 "CollectionPage.c"
+#line 6215 "CollectionPage.c"
 	}
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/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 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6201 "CollectionPage.c"
+#line 6251 "CollectionPage.c"
 }
 
 
@@ -6211,49 +6261,49 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/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 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6229 "CollectionPage.c"
+#line 6279 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/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 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/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 6245 "CollectionPage.c"
+#line 6295 "CollectionPage.c"
 	}
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/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 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6257 "CollectionPage.c"
+#line 6307 "CollectionPage.c"
 }
 
 
@@ -6267,56 +6317,56 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/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 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6285 "CollectionPage.c"
+#line 6335 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/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 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/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 6301 "CollectionPage.c"
+#line 6351 "CollectionPage.c"
 	}
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/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 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6313 "CollectionPage.c"
+#line 6363 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6320 "CollectionPage.c"
+#line 6370 "CollectionPage.c"
 }
 
 
@@ -6325,17 +6375,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6339 "CollectionPage.c"
+#line 6389 "CollectionPage.c"
 }
 
 
@@ -6348,7 +6398,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 6352 "CollectionPage.c"
+#line 6402 "CollectionPage.c"
 }
 
 
@@ -6358,14 +6408,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 6362 "CollectionPage.c"
+#line 6412 "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 6369 "CollectionPage.c"
+#line 6419 "CollectionPage.c"
 }
 
 
@@ -6374,7 +6424,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 6378 "CollectionPage.c"
+#line 6428 "CollectionPage.c"
 }
 
 
@@ -6406,6 +6456,8 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((PageClass *) klass)->add_actions = collection_page_real_add_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	((PageClass *) klass)->remove_actions = collection_page_real_remove_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"
 	((PageClass *) klass)->init_actions = collection_page_real_init_actions;
@@ -6425,7 +6477,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 6429 "CollectionPage.c"
+#line 6481 "CollectionPage.c"
 }
 
 
@@ -6439,7 +6491,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 6443 "CollectionPage.c"
+#line 6495 "CollectionPage.c"
 }
 
 
@@ -6453,7 +6505,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 6457 "CollectionPage.c"
+#line 6509 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index c43c0c8..df39f64 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -170,10 +170,17 @@ public abstract class CollectionPage : MediaPage {
         { "Slideshow", on_slideshow }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     protected override InjectionGroup[] init_collect_injection_groups() {
@@ -312,7 +319,7 @@ public abstract class CollectionPage : MediaPage {
     }
     
     // see #2020
-    // double clcik = switch to photo page
+    // double click = switch to photo page
     // Super + double click = open in external editor
     // Enter = switch to PhotoPage
     // Ctrl + Enter = open in external editor (handled with accelerators)
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 20e9f70..80325c1 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -1,4 +1,4 @@
-/* ColorTransformation.c generated by valac 0.32.1, the Vala compiler
+/* ColorTransformation.c generated by valac 0.34.4, the Vala compiler
  * generated from ColorTransformation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12067,19 +12067,19 @@ static gchar* string_chug (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 12080 "ColorTransformation.c"
 }
@@ -12090,19 +12090,19 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 12103 "ColorTransformation.c"
 }
diff --git a/src/CommandManager.c b/src/CommandManager.c
index 60cb438..a6a282b 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.32.1, the Vala compiler
+/* CommandManager.c generated by valac 0.34.4, the Vala compiler
  * generated from CommandManager.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Commands.c b/src/Commands.c
index 7211f77..704c577 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.32.1, the Vala compiler
+/* Commands.c generated by valac 0.34.4, the Vala compiler
  * generated from Commands.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch452_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 __finally452;
-	__catch452_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"
 	}
-	__finally452:
+	__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 __catch453_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 __finally453;
-	__catch453_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"
 	}
-	__finally453:
+	__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 __catch454_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 __finally454;
-	__catch454_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"
 	}
-	__finally454:
+	__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 __catch455_g_error;
+				goto __catch457_g_error;
 			}
 		}
-		goto __finally455;
-		__catch455_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"
 		}
-		__finally455:
+		__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 __catch456_g_error;
+				goto __catch458_g_error;
 			}
 		}
-		goto __finally456;
-		__catch456_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"
 		}
-		__finally456:
+		__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"
@@ -14570,11 +14570,11 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 14580 "Commands.c"
 	{
@@ -14589,98 +14589,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14611 "Commands.c"
-				goto __catch457_g_regex_error;
+				goto __catch459_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 14620 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14636 "Commands.c"
-				goto __catch457_g_regex_error;
+				goto __catch459_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 14647 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 14661 "Commands.c"
 	}
-	goto __finally457;
-	__catch457_g_regex_error:
+	goto __finally459;
+	__catch459_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 14675 "Commands.c"
 	}
-	__finally457:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__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.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 14686 "Commands.c"
 	}
@@ -15981,37 +15981,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 15997 "Commands.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 16005 "Commands.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 16017 "Commands.c"
 	}
@@ -16031,112 +16031,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 16041 "Commands.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 16047 "Commands.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 16051 "Commands.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 16055 "Commands.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 16067 "Commands.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 16077 "Commands.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 16083 "Commands.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 16097 "Commands.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 16107 "Commands.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 16113 "Commands.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 16122 "Commands.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 16142 "Commands.c"
 }
diff --git a/src/Commands.vala b/src/Commands.vala
index 73e6c8d..75164c5 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -2269,7 +2269,7 @@ public class TagUntagPhotosCommand : SimpleProxyableCommand {
     private void do_detach(Tag tag) {
         if (attached_to == null) {
             // detaching a MediaSource from a Tag may result in the MediaSource being detached from
-            // many tags (due to heirarchical tagging), so save the MediaSources for each detached
+            // many tags (due to hierarchical tagging), so save the MediaSources for each detached
             // Tag for reversing the process
             detached_from = tag.detach_many(sources);
             
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
index 053e2fa..bc287da 100644
--- a/src/CustomComponents.c
+++ b/src/CustomComponents.c
@@ -1,4 +1,4 @@
-/* CustomComponents.c generated by valac 0.32.1, the Vala compiler
+/* CustomComponents.c generated by valac 0.34.4, the Vala compiler
  * generated from CustomComponents.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Debug.c b/src/Debug.c
index 7711599..3edfcd9 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.32.1, the Vala compiler
+/* Debug.c generated by valac 0.34.4, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch429_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 __finally429;
-		__catch429_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"
 		}
-		__finally429:
+		__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"
@@ -526,13 +526,13 @@ gboolean debug_is_enabled (GLogLevelFlags flag) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 538 "Debug.c"
 }
@@ -547,23 +547,23 @@ static gchar* g_time_to_string (struct tm *self) {
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
 	gchar* _tmp6_ = NULL;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = (*self).tm_year;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = (*self).tm_mon;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = (*self).tm_mday;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = (*self).tm_hour;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = (*self).tm_min;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = (*self).tm_sec;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp6_;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 569 "Debug.c"
 }
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index 63d3682..0c25115 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.32.1, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.34.4, the Vala compiler
  * generated from DesktopIntegration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -484,17 +484,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 500 "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 __catch562_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 __finally562;
-	__catch562_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"
 	}
-	__finally562:
+	__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 __catch563_g_error;
+			goto __catch565_g_error;
 		}
 	}
-	goto __finally563;
-	__catch563_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"
 	}
-	__finally563:
+	__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"
@@ -1802,7 +1802,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati
 #line 1803 "DesktopIntegration.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OUTPUT_STREAM, GOutputStream));
+	_tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream));
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (self->priv->outs);
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2200,7 +2200,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp7_ = self->priv->outs;
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+	g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 254 "/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 __catch564_g_error;
+			goto __catch566_g_error;
 		}
 	}
-	goto __finally564;
-	__catch564_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"
 	}
-	__finally564:
+	__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 __catch565_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 __catch565_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 __catch565_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 __finally565;
-	__catch565_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"
 	}
-	__finally565:
+	__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 3db0786..fdd6e47 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.32.1, the Vala compiler
+/* Dialogs.c generated by valac 0.34.4, the Vala compiler
  * generated from Dialogs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3976,15 +3976,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3986 "Dialogs.c"
 }
@@ -8774,39 +8774,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
 #line 8791 "Dialogs.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 8797 "Dialogs.c"
 }
@@ -8921,7 +8921,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8909 "Dialogs.c"
-				goto __catch421_g_error;
+				goto __catch423_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
@@ -8934,31 +8934,31 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21__length1 = _tmp20__length1;
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OUTPUT_STREAM, GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
+			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8928 "Dialogs.c"
-				goto __catch421_g_error;
+				goto __catch423_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8939 "Dialogs.c"
-				goto __catch421_g_error;
+				goto __catch423_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
 #line 8944 "Dialogs.c"
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally423;
+		__catch423_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_ = NULL;
@@ -8988,7 +8988,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_error_free0 (err);
 #line 8975 "Dialogs.c"
 		}
-		__finally421:
+		__finally423:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9973,19 +9973,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 9976 "Dialogs.c"
 }
@@ -9995,17 +9995,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 9996 "Dialogs.c"
 }
@@ -10018,33 +10018,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 10021 "Dialogs.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10029 "Dialogs.c"
 	} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10035 "Dialogs.c"
 	}
@@ -10309,37 +10309,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 10310 "Dialogs.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10318 "Dialogs.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 10330 "Dialogs.c"
 	}
@@ -10359,112 +10359,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 10354 "Dialogs.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 10360 "Dialogs.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 10364 "Dialogs.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 10368 "Dialogs.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 10380 "Dialogs.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 10390 "Dialogs.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 10396 "Dialogs.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 10410 "Dialogs.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 10420 "Dialogs.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 10426 "Dialogs.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 10435 "Dialogs.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 10455 "Dialogs.c"
 }
@@ -13585,13 +13585,13 @@ static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 13582 "Dialogs.c"
 }
@@ -14259,7 +14259,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14247 "Dialogs.c"
-			goto __catch422_g_error;
+			goto __catch424_g_error;
 		}
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
@@ -14273,8 +14273,8 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_object_unref0 (_tmp113_);
 #line 14260 "Dialogs.c"
 	}
-	goto __finally422;
-	__catch422_g_error:
+	goto __finally424;
+	__catch424_g_error:
 	{
 		GError* err = NULL;
 		Dateable* _tmp117_ = NULL;
@@ -14298,7 +14298,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_error_free0 (err);
 #line 14285 "Dialogs.c"
 	}
-	__finally422:
+	__finally424:
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14681,35 +14681,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 14700 "Dialogs.c"
 }
@@ -17580,7 +17580,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17566 "Dialogs.c"
-			goto __catch423_g_error;
+			goto __catch425_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
@@ -17593,7 +17593,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
 #line 17579 "Dialogs.c"
-			goto __catch423_g_error;
+			goto __catch425_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
@@ -17617,8 +17617,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17602 "Dialogs.c"
 	}
-	goto __finally423;
-	__catch423_g_error:
+	goto __finally425;
+	__catch425_g_error:
 	{
 		GError* e = NULL;
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17635,7 +17635,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17620 "Dialogs.c"
 	}
-	__finally423:
+	__finally425:
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18527,11 +18527,11 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18513 "Dialogs.c"
-			goto __catch424_g_error;
+			goto __catch426_g_error;
 		}
 	}
-	goto __finally424;
-	__catch424_g_error:
+	goto __finally426;
+	__catch426_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -18550,7 +18550,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		_g_error_free0 (e);
 #line 18535 "Dialogs.c"
 	}
-	__finally424:
+	__finally426:
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18685,7 +18685,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2424 "/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 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+	_tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
 #line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	combo_store = _tmp17_;
 #line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18791,7 +18791,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18777 "Dialogs.c"
-						goto __catch425_g_error;
+						goto __catch427_g_error;
 					}
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
@@ -18800,7 +18800,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					g_value_init (&_tmp40_, GDK_TYPE_PIXBUF);
+					g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_take_object (&_tmp40_, _tmp39_);
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18843,7 +18843,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18829 "Dialogs.c"
-							goto __catch425_g_error;
+							goto __catch427_g_error;
 						}
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
@@ -18852,7 +18852,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp50_ = icon_pixbuf;
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						g_value_init (&_tmp51_, GDK_TYPE_PIXBUF);
+						g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_set_object (&_tmp51_, _tmp50_);
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18865,8 +18865,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					}
 				}
 			}
-			goto __finally425;
-			__catch425_g_error:
+			goto __finally427;
+			__catch427_g_error:
 			{
 				GError* _error_ = NULL;
 				GError* _tmp52_ = NULL;
@@ -18893,7 +18893,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				_g_error_free0 (_error_);
 #line 18878 "Dialogs.c"
 			}
-			__finally425:
+			__finally427:
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index ef26b0e..d2f2cb0 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -2668,7 +2668,7 @@ public class PreferencesDialog {
     
     private bool map_event() {
         // Set the signal for the lib dir button after the dialog is displayed, 
-        // because the FileChooserButton has a nasty habbit of selecting a
+        // because the FileChooserButton has a nasty habit of selecting a
         // different folder when displayed if the provided path doesn't exist.
         // See ticket #3000 for more info.
         library_dir_button.current_folder_changed.connect(on_current_folder_changed);
diff --git a/src/Dimensions.c b/src/Dimensions.c
index 57c20a2..8dea342 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -1,4 +1,4 @@
-/* Dimensions.c generated by valac 0.32.1, the Vala compiler
+/* Dimensions.c generated by valac 0.34.4, the Vala compiler
  * generated from Dimensions.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Dimensions.vala b/src/Dimensions.vala
index b5556da..7c9eed6 100644
--- a/src/Dimensions.vala
+++ b/src/Dimensions.vala
@@ -199,7 +199,7 @@ public struct Dimensions {
         return scaled_rect;
     }
     
-    // Returns the current dimensions scaled in a similar proportion as the two suppled dimensions
+    // Returns the current dimensions scaled in a similar proportion as the two supplied dimensions
     public Dimensions get_scaled_similar(Dimensions original, Dimensions scaled) {
         double x_scale, y_scale;
         original.get_scale_ratios(scaled, out x_scale, out y_scale);
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index 7527ed1..b99f323 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.32.1, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.34.4, the Vala compiler
  * generated from DirectoryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2099,13 +2099,13 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2948,13 +2948,13 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -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 __catch477_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 __finally477;
-		__catch477_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"
 		}
-		__finally477:
+		__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 __catch478_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 __catch478_g_error;
+					goto __catch480_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -4250,7 +4250,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp72_ = NULL;
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp72_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->file_map);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4306,7 +4306,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp81_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp81_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->dir_map);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4371,8 +4371,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4369 "DirectoryMonitor.c"
 	}
-	goto __finally478;
-	__catch478_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"
 	}
-	__finally478:
+	__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 __catch479_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 __finally479;
-	__catch479_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"
 	}
-	__finally479:
+	__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"
@@ -7539,7 +7539,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = source;
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_FILE, GFile));
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile));
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	source_file = _tmp1_;
 #line 7540 "DirectoryMonitor.c"
@@ -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 __catch480_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 __finally480;
-	__catch480_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"
 	}
-	__finally480:
+	__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 __catch481_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 __finally481;
-	__catch481_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"
 	}
-	__finally481:
+	__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"
@@ -9165,7 +9165,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 #line 9160 "DirectoryMonitor.c"
 						GeeArrayList* _tmp17_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_tmp17_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_g_object_unref0 (pruned);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9637,11 +9637,11 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self);
 #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->map = _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->id_map = _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9797,43 +9797,43 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
+	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
+	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 9834 "DirectoryMonitor.c"
diff --git a/src/Event.c b/src/Event.c
index 60e96ca..3544857 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,4 +1,4 @@
-/* Event.c generated by valac 0.32.1, the Vala compiler
+/* Event.c generated by valac 0.34.4, the Vala compiler
  * generated from Event.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch432_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 __finally432;
-	__catch432_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"
 	}
-	__finally432:
+	__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 __catch433_g_error;
+			goto __catch435_g_error;
 		}
 	}
-	goto __finally433;
-	__catch433_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"
 	}
-	__finally433:
+	__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 __catch434_g_error;
+			goto __catch436_g_error;
 		}
 	}
-	goto __finally434;
-	__catch434_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"
 	}
-	__finally434:
+	__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 __catch435_g_error;
+			goto __catch437_g_error;
 		}
 	}
-	goto __finally435;
-	__catch435_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"
 	}
-	__finally435:
+	__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 __catch436_g_error;
+			goto __catch438_g_error;
 		}
 	}
-	goto __finally436;
-	__catch436_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"
 	}
-	__finally436:
+	__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"
@@ -4322,72 +4322,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 4332 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 4342 "Event.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 4352 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 4358 "Event.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 4369 "Event.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 4381 "Event.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 4385 "Event.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 4389 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 4393 "Event.c"
 		gint i = 0;
@@ -4410,16 +4410,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 4416 "Event.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 4425 "Event.c"
 				gboolean _tmp11_ = FALSE;
@@ -4432,97 +4432,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 4438 "Event.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 4444 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 4454 "Event.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 4466 "Event.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 4470 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 4476 "Event.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 4487 "Event.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 4502 "Event.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 4506 "Event.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 4510 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 4516 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 4528 "Event.c"
 					gchar** _tmp25_ = NULL;
@@ -4531,91 +4531,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 4549 "Event.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 4553 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 4559 "Event.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 4566 "Event.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 4574 "Event.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 4612 "Event.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 4621 "Event.c"
 				gint _tmp48_ = 0;
@@ -4631,94 +4631,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 4637 "Event.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 4643 "Event.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 4657 "Event.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 4677 "Event.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 4692 "Event.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 4696 "Event.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 4704 "Event.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 4715 "Event.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 4724 "Event.c"
 	}
@@ -4898,13 +4898,13 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 4910 "Event.c"
 }
@@ -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 __catch437_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 __finally437;
-	__catch437_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"
 	}
-	__finally437:
+	__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 __catch438_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 __finally438;
-	__catch438_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"
 	}
-	__finally438:
+	__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 __catch439_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 __finally439;
-	__catch439_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"
 	}
-	__finally439:
+	__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 999c598..3f7a625 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.32.1, the Vala compiler
+/* Exporter.c generated by valac 0.34.4, the Vala compiler
  * generated from Exporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch475_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 __finally475;
-				__catch475_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"
 				}
-				__finally475:
+				__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 __catch476_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 __catch476_g_error;
+					goto __catch478_g_error;
 				}
 			}
 		}
 	}
-	goto __finally476;
-	__catch476_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"
 	}
-	__finally476:
+	__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/International.c b/src/International.c
index db54c27..b4f2b43 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.32.1, the Vala compiler
+/* International.c generated by valac 0.34.4, the Vala compiler
  * generated from International.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 3a088bf..48f84e9 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.32.1, the Vala compiler
+/* LibraryFiles.c generated by valac 0.34.4, the Vala compiler
  * generated from LibraryFiles.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch459_g_error;
+			goto __catch461_g_error;
 		}
 	}
-	goto __finally459;
-	__catch459_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 __finally459;
+			goto __finally461;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally459:
+	__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 __catch460_g_error;
+			goto __catch462_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally460;
-	__catch460_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"
 	}
-	__finally460:
+	__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 __catch461_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 __finally461;
-		__catch461_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"
 		}
-		__finally461:
+		__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 __catch462_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 __finally462;
-		__catch462_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"
 		}
-		__finally462:
+		__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 __catch463_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 __finally463;
-	__catch463_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 __finally463;
+				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 __finally463;
+				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"
 	}
-	__finally463:
+	__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 __catch464_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 __catch464_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 __finally464;
-	__catch464_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"
 	}
-	__finally464:
+	__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 761ddd2..ea83be6 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.32.1, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.34.4, the Vala compiler
  * generated from LibraryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2251,7 +2251,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->discovered = _tmp28_;
 #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp29_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->unknown_files);
 #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2624,7 +2624,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp4_ = NULL;
 #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_data_->_tmp4_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->adopted = _data_->_tmp4_;
 #line 2631 "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 __catch482_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 __finally482;
-					__catch482_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"
 					}
-					__finally482:
+					__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 __catch483_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 __finally483;
-		__catch483_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"
 		}
-		__finally483:
+		__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"
 		}
-		__finally484:
+		__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"
 			}
 		}
-		__finally485:
+		__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"
 		}
-		__finally486:
+		__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"
 		}
-		__finally487:
+		__finally489:
 		{
 			GeeHashSet* _tmp5_ = NULL;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6053,7 +6053,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 #line 6054 "LibraryMonitor.c"
 				GeeArrayList* _tmp39_ = NULL;
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_tmp39_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+				_tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_import);
 #line 797 "/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 __catch488_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 __finally488;
-	__catch488_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"
 	}
-	__finally488:
+	__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 __catch489_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 __finally489;
-	__catch489_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"
 	}
-	__finally489:
+	__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"
@@ -8727,11 +8727,11 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) {
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_rec_mutex_init (&__lock_library_monitor_blacklist);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_blacklist = _tmp0_;
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp1_ = hash_timed_queue_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW);
+	_tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW);
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_to_unblacklist = _tmp1_;
 #line 8736 "LibraryMonitor.c"
@@ -8770,11 +8770,11 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 #line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->discovered = NULL;
 #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp4_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->import_queue = _tmp4_;
 #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp5_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->pending_imports = _tmp5_;
 #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 5e80e43..30783d9 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.32.1, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaDataRepresentation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch557_g_error;
+			goto __catch559_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally557;
-	__catch557_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"
 	}
-	__finally557:
+	__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 __catch558_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 __finally558;
-			__catch558_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"
 			}
-			__finally558:
+			__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 __catch559_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 __finally559;
-			__catch559_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"
 			}
-			__finally559:
+			__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"
@@ -3481,7 +3481,7 @@ static void media_source_class_init (MediaSourceClass * klass) {
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_source_finalize;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("master_replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE);
+	g_signal_new ("master_replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
 #line 3484 "MediaDataRepresentation.c"
 }
 
@@ -3970,7 +3970,7 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se
 #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->master_file_map = _tmp0_;
 #line 3975 "MediaDataRepresentation.c"
@@ -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 __catch560_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 __finally560;
-		__catch560_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"
 		}
-		__finally560:
+		__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 __catch561_g_error;
+					goto __catch563_g_error;
 				}
 			}
-			goto __finally561;
-			__catch561_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"
 			}
-			__finally561:
+			__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"
@@ -6839,7 +6839,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_new ("media_import_completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, G_TYPE_FILE, G_TYPE_FILE);
+	g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ());
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_new ("trashcan_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6864,7 +6864,7 @@ static void media_source_collection_instance_init (MediaSourceCollection * self)
 #line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->offline_bin = NULL;
 #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->by_master_file = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index ba3f229..c81acbf 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch568_g_error;
+					goto __catch570_g_error;
 				}
 			}
-			goto __finally568;
-			__catch568_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"
 			}
-			__finally568:
+			__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"
 			}
 		}
-		__finally567:
+		__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 __catch570_g_error;
+					goto __catch572_g_error;
 				}
 			}
-			goto __finally570;
-			__catch570_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"
 			}
-			__finally570:
+			__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"
 			}
 		}
-		__finally569:
+		__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"
 		}
-		__finally566:
+		__finally568:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c
index b426c62..ddecf33 100644
--- a/src/MediaMetadata.c
+++ b/src/MediaMetadata.c
@@ -1,4 +1,4 @@
-/* MediaMetadata.c generated by valac 0.32.1, the Vala compiler
+/* MediaMetadata.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1093,13 +1093,13 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 1105 "MediaMetadata.c"
 }
@@ -1117,35 +1117,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1151 "MediaMetadata.c"
 }
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index aa1cd67..f741331 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.32.1, the Vala compiler
+/* MediaMonitor.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2166,7 +2166,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 2167 "MediaMonitor.c"
 					GeeHashMap* _tmp12_ = NULL;
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					_g_object_unref0 (set_master_file);
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -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 __catch579_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 __finally579;
-		__catch579_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"
 		}
-		__finally579:
+		__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 3cd4e03..90f8ac6 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.32.1, the Vala compiler
+/* MediaPage.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,8 +18,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pango.h>
 #include <gtk/gtk.h>
-#include <gee.h>
 #include <gio/gio.h>
+#include <gee.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -301,16 +301,6 @@ 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 ())
@@ -777,7 +767,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -1133,8 +1124,6 @@ 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;
@@ -1168,11 +1157,9 @@ 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 void media_page_real_add_actions (Page* base);
-void page_add_actions (Page* self);
+static void media_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
 void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by);
-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_new23 (gboolean value);
 static GVariant* _variant_new24 (gboolean value);
@@ -1182,6 +1169,10 @@ static GVariant* _variant_new27 (gchar* value);
 static GVariant* _variant_new28 (const gchar* value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 static GVariant* _variant_new29 (const gchar* value);
+static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self);
+static void media_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -1379,9 +1370,7 @@ static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* act
 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);
@@ -1457,7 +1446,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}};
+static const GActionEntry MEDIA_PAGE_entries[30] = {{"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}};
 
 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;
@@ -1492,7 +1481,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 1496 "MediaPage.c"
+#line 1485 "MediaPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = resources_load_icon ("sprocket.png", 0);
@@ -1500,18 +1489,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 1504 "MediaPage.c"
+#line 1493 "MediaPage.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 1508 "MediaPage.c"
+#line 1497 "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 1515 "MediaPage.c"
+#line 1504 "MediaPage.c"
 }
 
 
@@ -1545,7 +1534,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 1549 "MediaPage.c"
+#line 1538 "MediaPage.c"
 	} else {
 		gdouble reduction_factor = 0.0;
 		gint _tmp3_ = 0;
@@ -1579,7 +1568,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 1583 "MediaPage.c"
+#line 1572 "MediaPage.c"
 		} else {
 			gint _tmp10_ = 0;
 			GdkPixbuf* _tmp11_ = NULL;
@@ -1595,11 +1584,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 1599 "MediaPage.c"
+#line 1588 "MediaPage.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp8_) {
-#line 1603 "MediaPage.c"
+#line 1592 "MediaPage.c"
 			GdkPixbuf* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -1616,7 +1605,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 1620 "MediaPage.c"
+#line 1609 "MediaPage.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = media_source_item_current_sprocket_pixbuf;
@@ -1626,7 +1615,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 1630 "MediaPage.c"
+#line 1619 "MediaPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = ctx;
@@ -1640,7 +1629,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 1644 "MediaPage.c"
+#line 1633 "MediaPage.c"
 		cairo_t* _tmp25_ = NULL;
 		GdkPoint _tmp26_ = {0};
 		Dimensions _tmp27_ = {0};
@@ -1652,7 +1641,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 1656 "MediaPage.c"
+#line 1645 "MediaPage.c"
 	}
 }
 
@@ -1699,7 +1688,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 1703 "MediaPage.c"
+#line 1692 "MediaPage.c"
 }
 
 
@@ -1769,19 +1758,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 1773 "MediaPage.c"
+#line 1762 "MediaPage.c"
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		i = 0;
-#line 1778 "MediaPage.c"
+#line 1767 "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 1785 "MediaPage.c"
+#line 1774 "MediaPage.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				cairo_t* _tmp17_ = NULL;
@@ -1798,13 +1787,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 1802 "MediaPage.c"
+#line 1791 "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 1808 "MediaPage.c"
+#line 1797 "MediaPage.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp13_ = FALSE;
@@ -1816,7 +1805,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 1820 "MediaPage.c"
+#line 1809 "MediaPage.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = ctx;
@@ -1850,7 +1839,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 1854 "MediaPage.c"
+#line 1843 "MediaPage.c"
 			}
 		}
 	}
@@ -1870,7 +1859,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 1874 "MediaPage.c"
+#line 1863 "MediaPage.c"
 		cairo_t* _tmp35_ = NULL;
 		cairo_t* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
@@ -1983,7 +1972,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 1987 "MediaPage.c"
+#line 1976 "MediaPage.c"
 	}
 }
 
@@ -1996,7 +1985,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 2000 "MediaPage.c"
+#line 1989 "MediaPage.c"
 }
 
 
@@ -2020,7 +2009,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 2024 "MediaPage.c"
+#line 2013 "MediaPage.c"
 }
 
 
@@ -2035,7 +2024,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 2039 "MediaPage.c"
+#line 2028 "MediaPage.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2046,7 +2035,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 2050 "MediaPage.c"
+#line 2039 "MediaPage.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->natural_collation_key;
@@ -2056,7 +2045,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 2060 "MediaPage.c"
+#line 2049 "MediaPage.c"
 }
 
 
@@ -2069,7 +2058,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 2073 "MediaPage.c"
+#line 2062 "MediaPage.c"
 }
 
 
@@ -2080,7 +2069,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 2084 "MediaPage.c"
+#line 2073 "MediaPage.c"
 }
 
 
@@ -2092,7 +2081,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 2096 "MediaPage.c"
+#line 2085 "MediaPage.c"
 }
 
 
@@ -2123,217 +2112,210 @@ 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"
+#line 2116 "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"
+#line 2123 "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"
+#line 2130 "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"
+#line 2137 "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"
+#line 2144 "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"
+#line 2151 "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"
+#line 2158 "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"
+#line 2165 "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"
+#line 2172 "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"
+#line 2179 "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"
+#line 2186 "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"
+#line 2193 "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"
+#line 2200 "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"
+#line 2207 "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"
+#line 2214 "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"
+#line 2221 "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"
+#line 2228 "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"
+#line 2235 "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"
+#line 2242 "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"
+#line 2249 "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"
+#line 2256 "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"
+#line 2263 "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"
+#line 2270 "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"
+#line 2277 "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"
+#line 2284 "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"
+#line 2291 "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"
+#line 2298 "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"
+#line 2305 "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"
+#line 2312 "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 2337 "MediaPage.c"
+#line 2319 "MediaPage.c"
 }
 
 
@@ -2532,7 +2514,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 2536 "MediaPage.c"
+#line 2518 "MediaPage.c"
 }
 
 
@@ -2563,7 +2545,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 2567 "MediaPage.c"
+#line 2549 "MediaPage.c"
 }
 
 
@@ -2594,7 +2576,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 2598 "MediaPage.c"
+#line 2580 "MediaPage.c"
 }
 
 
@@ -2614,67 +2596,74 @@ 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 2618 "MediaPage.c"
+#line 2600 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new23 (gboolean value) {
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2625 "MediaPage.c"
+#line 2607 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new24 (gboolean value) {
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2632 "MediaPage.c"
+#line 2614 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new25 (gboolean value) {
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2639 "MediaPage.c"
+#line 2621 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new26 (gboolean value) {
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2646 "MediaPage.c"
+#line 2628 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new27 (gchar* value) {
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2653 "MediaPage.c"
+#line 2635 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new28 (const gchar* value) {
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2660 "MediaPage.c"
+#line 2642 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new29 (const gchar* value) {
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2667 "MediaPage.c"
+#line 2649 "MediaPage.c"
+}
+
+
+static void _media_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
+#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_raw_developer_changed ((MediaPage*) self, _sender, value);
+#line 2656 "MediaPage.c"
 }
 
 
-static void media_page_real_add_actions (Page* base) {
+static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	MediaPage * self;
+	GActionMap* _tmp0_ = NULL;
 	gboolean sort_order = FALSE;
 	gint sort_by = 0;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	AppWindow* _tmp2_ = NULL;
-	AppWindow* _tmp3_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	gint _tmp2_ = 0;
+	GActionMap* _tmp3_ = NULL;
 	GAction* _tmp4_ = NULL;
 	GAction* _tmp5_ = NULL;
 	ConfigFacade* _tmp6_ = NULL;
@@ -2717,162 +2706,165 @@ static void media_page_real_add_actions (Page* base) {
 	RawDeveloper _tmp42_ = 0;
 	const gchar* _tmp43_ = NULL;
 	RawDeveloper _tmp44_ = 0;
-	GAction* _tmp45_ = NULL;
-	GAction* _tmp46_ = NULL;
-	GVariant* _tmp47_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* action = NULL;
+	const GVariantType* _tmp45_ = NULL;
+	GVariant* _tmp46_ = NULL;
+	GSimpleAction* _tmp47_ = NULL;
+	GSimpleAction* _tmp48_ = NULL;
+	GActionMap* _tmp49_ = NULL;
+#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	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"
-	_tmp2_ = app_window_get_instance ();
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	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 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = map;
+#line 324 "/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), _tmp0_);
+#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_get_config_photos_sort (self, &_tmp1_, &_tmp2_);
+#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_order = _tmp1_;
+#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_by = _tmp2_;
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = map;
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_action_map_add_action_entries (_tmp3_, MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_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"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = config_facade_get_instance ();
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _variant_new23 (_tmp8_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp5_, _tmp9_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp9_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = _tmp12_;
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = _variant_new24 (_tmp14_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = _tmp16_;
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = config_facade_get_instance ();
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = _tmp18_;
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = _variant_new25 (_tmp20_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp17_, _tmp21_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp21_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = config_facade_get_instance ();
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = _tmp24_;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp26_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = _variant_new26 (_tmp26_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp23_, _tmp27_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp27_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp23_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp29_ = _tmp28_;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp30_ = sort_by;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp31_ = g_strdup_printf ("%d", _tmp30_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = _tmp31_;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp33_ = _variant_new27 (_tmp32_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp29_, _tmp33_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp33_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp32_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp29_);
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp35_ = sort_order;
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp35_) {
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "ascending";
-#line 2848 "MediaPage.c"
+#line 2840 "MediaPage.c"
 	} else {
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "descending";
-#line 2852 "MediaPage.c"
+#line 2844 "MediaPage.c"
 	}
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp37_ = _tmp36_;
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp38_ = _variant_new28 (_tmp34_);
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp37_, _tmp38_);
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp38_);
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp37_);
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp40_ = _tmp39_;
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp41_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp42_ = _tmp41_;
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	d = _tmp42_;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp44_ = d;
@@ -2880,25 +2872,82 @@ static void media_page_real_add_actions (Page* base) {
 	if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Shotwell";
-#line 2884 "MediaPage.c"
+#line 2876 "MediaPage.c"
 	} else {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Camera";
-#line 2888 "MediaPage.c"
+#line 2880 "MediaPage.c"
+	}
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp45_ = G_VARIANT_TYPE_STRING;
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp46_ = _variant_new29 (_tmp43_);
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp47_ = g_simple_action_new_stateful ("RawDeveloper", _tmp45_, _tmp46_);
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp48_ = _tmp47_;
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp46_);
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	action = _tmp48_;
+#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_signal_connect_object (action, "change-state", (GCallback) _media_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
+#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_enabled (action, TRUE);
+#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp49_ = map;
+#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_action_map_add_action (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
+#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (action);
+#line 2904 "MediaPage.c"
+}
+
+
+static void media_page_real_remove_actions (Page* base, GActionMap* map) {
+	MediaPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
+#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = map;
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	PAGE_CLASS (media_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 2919 "MediaPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		entry_collection = MEDIA_PAGE_entries;
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (MEDIA_PAGE_entries);
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (MEDIA_PAGE_entries); entry_it = entry_it + 1) {
+#line 2931 "MediaPage.c"
+			GActionEntry entry = {0};
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+			entry = entry_collection[entry_it];
+#line 2935 "MediaPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				_tmp1_ = map;
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				_tmp2_ = entry;
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 2948 "MediaPage.c"
+			}
+		}
 	}
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp46_ = _tmp45_;
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp47_ = _variant_new29 (_tmp43_);
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_action_change_state (_tmp46_, _tmp47_);
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp47_);
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp46_);
-#line 2902 "MediaPage.c"
 }
 
 
@@ -2922,119 +2971,119 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp20_ = 0;
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", _tmp0_ > 0);
-#line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = selected_count;
-#line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", _tmp1_ > 0);
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = selected_count;
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ > 0);
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_get_thumb_size (self);
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 347 "/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), "IncreaseSize", _tmp3_ < _tmp5_);
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_get_thumb_size (self);
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MIN_SCALE ();
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp6_ > _tmp8_);
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = selected_count;
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp9_ > 0);
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = selected_count;
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", _tmp10_ > 0);
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = desktop_integration_is_send_to_installed ();
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_) {
-#line 2968 "MediaPage.c"
+#line 3017 "MediaPage.c"
 		gint _tmp12_ = 0;
-#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = selected_count;
-#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 2974 "MediaPage.c"
+#line 3023 "MediaPage.c"
 	} else {
-#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
-#line 2978 "MediaPage.c"
+#line 3027 "MediaPage.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = selected_count;
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", _tmp13_ > 0);
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_development_menu_item_sensitivity (self);
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = selected_count;
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp15_ == 1) {
-#line 2992 "MediaPage.c"
+#line 3041 "MediaPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		DataSource* _tmp18_ = NULL;
 		DataSource* _tmp19_ = NULL;
-#line 363 "/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 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _tmp16_;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = view_collection_get_selected_source_at (_tmp17_, 0);
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 3011 "MediaPage.c"
+#line 3060 "MediaPage.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = FALSE;
-#line 3015 "MediaPage.c"
+#line 3064 "MediaPage.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
-#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = selected_count;
-#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_flag_action (self, _tmp20_);
-#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = selected_count;
-#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = count;
-#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 377 "/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 3029 "MediaPage.c"
+#line 3078 "MediaPage.c"
 }
 
 
 static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
-#line 370 "/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 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3038 "MediaPage.c"
+#line 3087 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -3043,25 +3092,25 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = altered;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_object_it = _tmp5_;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3065 "MediaPage.c"
+#line 3114 "MediaPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3073,65 +3122,65 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			Alteration* _tmp13_ = NULL;
 			gboolean _tmp14_ = FALSE;
 			gboolean _tmp15_ = FALSE;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = _object_it;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp7_) {
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3085 "MediaPage.c"
+#line 3134 "MediaPage.c"
 			}
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _object_it;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = altered;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = object;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = (Alteration*) _tmp12_;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = alteration_has_detail (_tmp13_, "metadata", "flagged");
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_alteration_unref0 (_tmp13_);
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp15_) {
-#line 3109 "MediaPage.c"
+#line 3158 "MediaPage.c"
 				ViewCollection* _tmp16_ = NULL;
 				ViewCollection* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = _tmp16_;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				media_page_update_flag_action (self, _tmp18_);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_data_collection_unref0 (_tmp17_);
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (object);
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3127 "MediaPage.c"
+#line 3176 "MediaPage.c"
 			}
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 3131 "MediaPage.c"
+#line 3180 "MediaPage.c"
 		}
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3135 "MediaPage.c"
+#line 3184 "MediaPage.c"
 	}
 }
 
@@ -3146,45 +3195,45 @@ static void media_page_update_rating_sensitivities (MediaPage* self) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_can_rate_selected (self, RATING_REJECTED);
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp0_);
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_can_rate_selected (self, RATING_UNRATED);
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp1_);
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_can_rate_selected (self, RATING_ONE);
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp2_);
-#line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_can_rate_selected (self, RATING_TWO);
-#line 384 "/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), "RateTwo", _tmp3_);
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_can_rate_selected (self, RATING_THREE);
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp4_);
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = media_page_can_rate_selected (self, RATING_FOUR);
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp5_);
-#line 387 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_can_rate_selected (self, RATING_FIVE);
-#line 387 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp6_);
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = media_page_can_increase_selected_rating (self);
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp7_);
-#line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_page_can_decrease_selected_rating (self);
-#line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_);
-#line 3188 "MediaPage.c"
+#line 3237 "MediaPage.c"
 }
 
 
@@ -3198,37 +3247,37 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 	gboolean _tmp6_ = FALSE;
 	gboolean is_raw = FALSE;
 	gboolean _tmp27_ = FALSE;
-#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_ == 0;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp6_) {
-#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
-#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3228 "MediaPage.c"
+#line 3277 "MediaPage.c"
 	}
-#line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 3232 "MediaPage.c"
+#line 3281 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -3240,31 +3289,31 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		gint _view_index = 0;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp10_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _view_list;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp13_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3268 "MediaPage.c"
+#line 3317 "MediaPage.c"
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -3278,107 +3327,107 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			Photo* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
 			Photo* _tmp24_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_index;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp14_ + 1;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_index;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_size;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp15_ < _tmp16_)) {
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3294 "MediaPage.c"
+#line 3343 "MediaPage.c"
 			}
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _view_index;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = gee_list_get (_tmp17_, _tmp18_);
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp19_;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = view;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp21_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_THUMBNAIL, Thumbnail));
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_PHOTO) ? ((Photo*) _tmp21_) : NULL;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ == NULL) {
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3314 "MediaPage.c"
+#line 3363 "MediaPage.c"
 			}
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp24_ = photo;
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 3322 "MediaPage.c"
+#line 3371 "MediaPage.c"
 				Photo* _tmp25_ = NULL;
 				PhotoFileFormat _tmp26_ = 0;
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo;
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = photo_get_master_file_format (_tmp25_);
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 3331 "MediaPage.c"
+#line 3380 "MediaPage.c"
 			} else {
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 3335 "MediaPage.c"
+#line 3384 "MediaPage.c"
 			}
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				is_raw = TRUE;
-#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (photo);
-#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3347 "MediaPage.c"
+#line 3396 "MediaPage.c"
 			}
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3353 "MediaPage.c"
+#line 3402 "MediaPage.c"
 		}
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3357 "MediaPage.c"
+#line 3406 "MediaPage.c"
 	}
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = is_raw;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
-#line 3363 "MediaPage.c"
+#line 3412 "MediaPage.c"
 }
 
 
 static void media_page_update_flag_action (MediaPage* self, gint selected_count) {
 	gint _tmp0_ = 0;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 3375 "MediaPage.c"
+#line 3424 "MediaPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3382 "MediaPage.c"
+#line 3431 "MediaPage.c"
 }
 
 
@@ -3387,17 +3436,17 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp1_;
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3401 "MediaPage.c"
+#line 3450 "MediaPage.c"
 }
 
 
@@ -3411,53 +3460,53 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/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 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = display;
-#line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
-#line 3453 "MediaPage.c"
+#line 3502 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 	gboolean result = FALSE;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3461 "MediaPage.c"
+#line 3510 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3469,31 +3518,31 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3497 "MediaPage.c"
+#line 3546 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3507,75 +3556,75 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			Rating _tmp16_ = 0;
 			Rating _tmp17_ = 0;
 			gboolean _tmp18_ = FALSE;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3523 "MediaPage.c"
+#line 3572 "MediaPage.c"
 			}
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp16_ != _tmp17_;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3557 "MediaPage.c"
+#line 3606 "MediaPage.c"
 			}
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3561 "MediaPage.c"
+#line 3610 "MediaPage.c"
 		}
-#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3565 "MediaPage.c"
+#line 3614 "MediaPage.c"
 	}
-#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3571 "MediaPage.c"
+#line 3620 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3579 "MediaPage.c"
+#line 3628 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3587,31 +3636,31 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3615 "MediaPage.c"
+#line 3664 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3625,75 +3674,75 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			Rating _tmp16_ = 0;
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3641 "MediaPage.c"
+#line 3690 "MediaPage.c"
 			}
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_increase (_tmp16_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3675 "MediaPage.c"
+#line 3724 "MediaPage.c"
 			}
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3679 "MediaPage.c"
+#line 3728 "MediaPage.c"
 		}
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3683 "MediaPage.c"
+#line 3732 "MediaPage.c"
 	}
-#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3689 "MediaPage.c"
+#line 3738 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3697 "MediaPage.c"
+#line 3746 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3705,31 +3754,31 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3733 "MediaPage.c"
+#line 3782 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3743,84 +3792,84 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			Rating _tmp16_ = 0;
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3759 "MediaPage.c"
+#line 3808 "MediaPage.c"
 			}
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_decrease (_tmp16_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3793 "MediaPage.c"
+#line 3842 "MediaPage.c"
 			}
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3797 "MediaPage.c"
+#line 3846 "MediaPage.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3801 "MediaPage.c"
+#line 3850 "MediaPage.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3807 "MediaPage.c"
+#line 3856 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) {
 	MediaPageZoomSliderAssembly* result = NULL;
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_zoom_slider_assembly_new ();
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp0_;
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3824 "MediaPage.c"
+#line 3873 "MediaPage.c"
 }
 
 
@@ -3829,35 +3878,35 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkModifierType _tmp1_ = 0;
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_increase_zoom_level (self);
-#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3849 "MediaPage.c"
+#line 3898 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 475 "/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 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3861 "MediaPage.c"
+#line 3910 "MediaPage.c"
 	}
 }
 
@@ -3867,35 +3916,35 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkModifierType _tmp1_ = 0;
-#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_decrease_zoom_level (self);
-#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3887 "MediaPage.c"
+#line 3936 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 484 "/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 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3899 "MediaPage.c"
+#line 3948 "MediaPage.c"
 	}
 }
 
@@ -3905,23 +3954,23 @@ static void media_page_on_send_to (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	desktop_integration_send_to (_tmp3_);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3925 "MediaPage.c"
+#line 3974 "MediaPage.c"
 }
 
 
@@ -3940,59 +3989,59 @@ void media_page_on_play_video (MediaPage* self) {
 	Video* _tmp10_ = NULL;
 	Video* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3960 "MediaPage.c"
+#line 4009 "MediaPage.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO) ? ((Video*) _tmp8_) : NULL;
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_ == NULL) {
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 3978 "MediaPage.c"
+#line 4027 "MediaPage.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	video = _tmp10_;
-#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = video;
-#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_ == NULL) {
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3996 "MediaPage.c"
+#line 4045 "MediaPage.c"
 	}
 	{
 		Video* _tmp12_ = NULL;
@@ -4000,30 +4049,30 @@ void media_page_on_play_video (MediaPage* self) {
 		GFile* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = video;
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = _tmp13_;
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = g_file_get_uri (_tmp14_);
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_app_info_launch_default_for_uri (_tmp16_, NULL, &_inner_error_);
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp16_);
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4022 "MediaPage.c"
-			goto __catch556_g_error;
+#line 4071 "MediaPage.c"
+			goto __catch558_g_error;
 		}
 	}
-	goto __finally556;
-	__catch556_g_error:
+	goto __finally558;
+	__catch558_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -4031,44 +4080,44 @@ void media_page_on_play_video (MediaPage* self) {
 		const gchar* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		e = _inner_error_;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_inner_error_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _ ("Shotwell was unable to play the selected video:\n%s");
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = e;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_->message;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = g_strdup_printf (_tmp17_, _tmp19_);
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp21_);
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 4055 "MediaPage.c"
+#line 4104 "MediaPage.c"
 	}
-	__finally556:
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	__finally558:
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/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 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_clear_error (&_inner_error_);
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4068 "MediaPage.c"
+#line 4117 "MediaPage.c"
 	}
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 4072 "MediaPage.c"
+#line 4121 "MediaPage.c"
 }
 
 
@@ -4081,499 +4130,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 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label10 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label11 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label12 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label13 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label14 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label15 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label16 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label17 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label18 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label19 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label20 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label21 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label22 = 0;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label23 = 0;
-#line 4133 "MediaPage.c"
+#line 4182 "MediaPage.c"
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	handled = TRUE;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/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 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4156 "MediaPage.c"
+#line 4205 "MediaPage.c"
 			default:
 			{
-#line 504 "/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), "IncreaseSize");
-#line 505 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4163 "MediaPage.c"
+#line 4212 "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 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4169 "MediaPage.c"
+#line 4218 "MediaPage.c"
 			default:
 			{
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4176 "MediaPage.c"
+#line 4225 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4182 "MediaPage.c"
+#line 4231 "MediaPage.c"
 			default:
 			{
-#line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4189 "MediaPage.c"
+#line 4238 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4195 "MediaPage.c"
+#line 4244 "MediaPage.c"
 			default:
 			{
-#line 518 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4202 "MediaPage.c"
+#line 4251 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4208 "MediaPage.c"
+#line 4257 "MediaPage.c"
 			default:
 			{
-#line 522 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4215 "MediaPage.c"
+#line 4264 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4221 "MediaPage.c"
+#line 4270 "MediaPage.c"
 			default:
 			{
-#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 527 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 537 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4228 "MediaPage.c"
+#line 4277 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4234 "MediaPage.c"
+#line 4283 "MediaPage.c"
 			default:
 			{
-#line 530 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4241 "MediaPage.c"
+#line 4290 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4247 "MediaPage.c"
+#line 4296 "MediaPage.c"
 			default:
 			{
-#line 534 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4254 "MediaPage.c"
+#line 4303 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4260 "MediaPage.c"
+#line 4309 "MediaPage.c"
 			default:
 			{
-#line 538 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 539 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4267 "MediaPage.c"
+#line 4316 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4273 "MediaPage.c"
+#line 4322 "MediaPage.c"
 			default:
 			{
-#line 542 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4280 "MediaPage.c"
+#line 4329 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4286 "MediaPage.c"
+#line 4335 "MediaPage.c"
 			default:
 			{
-#line 546 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 547 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4293 "MediaPage.c"
+#line 4342 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4299 "MediaPage.c"
+#line 4348 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp6_ = FALSE;
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp6_) {
-#line 4307 "MediaPage.c"
+#line 4356 "MediaPage.c"
 					SearchViewFilter* _tmp7_ = NULL;
 					SearchViewFilter* _tmp8_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/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 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp8_ = _tmp7_;
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER);
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp8_);
-#line 4318 "MediaPage.c"
+#line 4367 "MediaPage.c"
 				}
-#line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4322 "MediaPage.c"
+#line 4371 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4328 "MediaPage.c"
+#line 4377 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp9_) {
-#line 4336 "MediaPage.c"
+#line 4385 "MediaPage.c"
 					SearchViewFilter* _tmp10_ = NULL;
 					SearchViewFilter* _tmp11_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/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 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp11_ = _tmp10_;
-#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER);
-#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp11_);
-#line 4347 "MediaPage.c"
+#line 4396 "MediaPage.c"
 				}
-#line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4351 "MediaPage.c"
+#line 4400 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4357 "MediaPage.c"
+#line 4406 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp12_) {
-#line 4365 "MediaPage.c"
+#line 4414 "MediaPage.c"
 					SearchViewFilter* _tmp13_ = NULL;
 					SearchViewFilter* _tmp14_ = NULL;
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/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 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = _tmp13_;
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER);
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp14_);
-#line 4376 "MediaPage.c"
+#line 4425 "MediaPage.c"
 				}
-#line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4380 "MediaPage.c"
+#line 4429 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4386 "MediaPage.c"
+#line 4435 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
-#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp15_) {
-#line 4394 "MediaPage.c"
+#line 4443 "MediaPage.c"
 					SearchViewFilter* _tmp16_ = NULL;
 					SearchViewFilter* _tmp17_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/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 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp17_ = _tmp16_;
-#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER);
-#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp17_);
-#line 4405 "MediaPage.c"
+#line 4454 "MediaPage.c"
 				}
-#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4409 "MediaPage.c"
+#line 4458 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4415 "MediaPage.c"
+#line 4464 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp18_ = FALSE;
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp18_) {
-#line 4423 "MediaPage.c"
+#line 4472 "MediaPage.c"
 					SearchViewFilter* _tmp19_ = NULL;
 					SearchViewFilter* _tmp20_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/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 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp20_ = _tmp19_;
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER);
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp20_);
-#line 4434 "MediaPage.c"
+#line 4483 "MediaPage.c"
 				}
-#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4438 "MediaPage.c"
+#line 4487 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4444 "MediaPage.c"
+#line 4493 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp21_ = FALSE;
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp21_) {
-#line 4452 "MediaPage.c"
+#line 4501 "MediaPage.c"
 					SearchViewFilter* _tmp22_ = NULL;
 					SearchViewFilter* _tmp23_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/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 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp23_ = _tmp22_;
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER);
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp23_);
-#line 4463 "MediaPage.c"
+#line 4512 "MediaPage.c"
 				}
-#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4467 "MediaPage.c"
+#line 4516 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4473 "MediaPage.c"
+#line 4522 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp24_ = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp24_) {
-#line 4481 "MediaPage.c"
+#line 4530 "MediaPage.c"
 					SearchViewFilter* _tmp25_ = NULL;
 					SearchViewFilter* _tmp26_ = NULL;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 591 "/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 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp26_ = _tmp25_;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER);
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp26_);
-#line 4492 "MediaPage.c"
+#line 4541 "MediaPage.c"
 				}
-#line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4496 "MediaPage.c"
+#line 4545 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4502 "MediaPage.c"
+#line 4551 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp27_ = FALSE;
-#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp27_) {
-#line 4510 "MediaPage.c"
+#line 4559 "MediaPage.c"
 					SearchViewFilter* _tmp28_ = NULL;
 					SearchViewFilter* _tmp29_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 596 "/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 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp29_ = _tmp28_;
-#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY);
-#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp29_);
-#line 4521 "MediaPage.c"
+#line 4570 "MediaPage.c"
 				}
-#line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4525 "MediaPage.c"
+#line 4574 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4531 "MediaPage.c"
+#line 4580 "MediaPage.c"
 			default:
 			{
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4538 "MediaPage.c"
+#line 4587 "MediaPage.c"
 			}
 		}
 	} else {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4544 "MediaPage.c"
+#line 4593 "MediaPage.c"
 			default:
 			{
-#line 594 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4551 "MediaPage.c"
+#line 4600 "MediaPage.c"
 			}
 		}
 	}
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp31_ = handled;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = TRUE;
-#line 4561 "MediaPage.c"
+#line 4610 "MediaPage.c"
 	} else {
 		GdkEventKey* _tmp32_ = NULL;
 		gboolean _tmp33_ = FALSE;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp32_ = event;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/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 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = _tmp33_;
-#line 4571 "MediaPage.c"
+#line 4620 "MediaPage.c"
 	}
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp30_;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 4577 "MediaPage.c"
+#line 4626 "MediaPage.c"
 }
 
 
@@ -4599,142 +4648,142 @@ static void media_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gboolean _tmp19_ = FALSE;
-#line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 612 "/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 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/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 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp4_);
-#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/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 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp7_);
-#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/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 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, _tmp10_);
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 619 "/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 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, _tmp13_);
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = _tmp14_;
-#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection));
-#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = _tmp16_;
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = _tmp18_ > 0;
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_) {
-#line 4675 "MediaPage.c"
+#line 4724 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		DataView* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = view_collection_get_selected_at (_tmp21_, 0);
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		selected = _tmp23_;
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = selected;
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp24_ != NULL) {
-#line 4698 "MediaPage.c"
+#line 4747 "MediaPage.c"
 			CheckerboardItem* _tmp25_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp25_ = selected;
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 4704 "MediaPage.c"
+#line 4753 "MediaPage.c"
 		}
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 4708 "MediaPage.c"
+#line 4757 "MediaPage.c"
 	}
-#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 4712 "MediaPage.c"
+#line 4761 "MediaPage.c"
 }
 
 
 static void media_page_real_switching_from (Page* base) {
 	MediaPage * self;
-#line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/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 4724 "MediaPage.c"
+#line 4773 "MediaPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4731 "MediaPage.c"
+#line 4780 "MediaPage.c"
 }
 
 
 static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
-#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 4738 "MediaPage.c"
+#line 4787 "MediaPage.c"
 }
 
 
@@ -4742,25 +4791,25 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp2_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (slider));
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = slider;
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = _tmp1_;
-#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->connected_slider;
-#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 641 "/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 632 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 4764 "MediaPage.c"
+#line 4813 "MediaPage.c"
 }
 
 
@@ -4770,29 +4819,29 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	ConfigFacade* _tmp2_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
-#line 635 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 637 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4782 "MediaPage.c"
+#line 4831 "MediaPage.c"
 	}
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->connected_slider;
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_zoom_slider_assembly_get_scale (_tmp3_);
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/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 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 4796 "MediaPage.c"
+#line 4845 "MediaPage.c"
 }
 
 
@@ -4806,39 +4855,39 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 642 "/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 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 644 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4818 "MediaPage.c"
+#line 4867 "MediaPage.c"
 	}
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/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 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _tmp3_;
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	persistent_scale = _tmp4_;
-#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = self->priv->connected_slider;
-#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = persistent_scale;
-#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_set_scale (_tmp5_, _tmp6_);
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = persistent_scale;
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_thumb_size (self, _tmp7_);
-#line 4842 "MediaPage.c"
+#line 4891 "MediaPage.c"
 }
 
 
@@ -4846,109 +4895,109 @@ void media_page_disconnect_slider (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4858 "MediaPage.c"
+#line 4907 "MediaPage.c"
 	}
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_parse_name ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, &_tmp2_, NULL, FALSE);
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/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 657 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 657 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 4870 "MediaPage.c"
+#line 4919 "MediaPage.c"
 }
 
 
 static void media_page_real_on_zoom_changed (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4880 "MediaPage.c"
+#line 4929 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp2_);
-#line 4889 "MediaPage.c"
+#line 4938 "MediaPage.c"
 	}
-#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 4893 "MediaPage.c"
+#line 4942 "MediaPage.c"
 }
 
 
 void media_page_on_zoom_changed (MediaPage* self) {
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 4902 "MediaPage.c"
+#line 4951 "MediaPage.c"
 }
 
 
 static void media_page_real_on_export (MediaPage* self) {
-#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/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 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 4911 "MediaPage.c"
+#line 4960 "MediaPage.c"
 }
 
 
 void media_page_on_export (MediaPage* self) {
-#line 667 "/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 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 4920 "MediaPage.c"
+#line 4969 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_size (MediaPage* self) {
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 4927 "MediaPage.c"
+#line 4976 "MediaPage.c"
 }
 
 
 void media_page_on_increase_size (MediaPage* self) {
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 4936 "MediaPage.c"
+#line 4985 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_size (MediaPage* self) {
-#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 4943 "MediaPage.c"
+#line 4992 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_size (MediaPage* self) {
-#line 673 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 673 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 4952 "MediaPage.c"
+#line 5001 "MediaPage.c"
 }
 
 
@@ -4967,45 +5016,45 @@ static void media_page_on_add_tags (MediaPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/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 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4987 "MediaPage.c"
+#line 5036 "MediaPage.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = add_tags_dialog_new ();
-#line 681 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp4_;
-#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = dialog;
-#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = add_tags_dialog_execute (_tmp5_, &_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = _tmp7_;
-#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names_length1 = _tmp6_;
-#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_names_size_ = names_length1;
-#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = names;
-#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8__length1 = names_length1;
-#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp8_ != NULL) {
-#line 5009 "MediaPage.c"
+#line 5058 "MediaPage.c"
 		CommandManager* _tmp9_ = NULL;
 		CommandManager* _tmp10_ = NULL;
 		HierarchicalTagIndex* _tmp11_ = NULL;
@@ -5022,57 +5071,57 @@ static void media_page_on_add_tags (MediaPage* self) {
 		GeeCollection* _tmp20_ = NULL;
 		AddTagsCommand* _tmp21_ = NULL;
 		AddTagsCommand* _tmp22_ = NULL;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = _tmp11_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = names;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13__length1 = names_length1;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16__length1 = _tmp14_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp17_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = view_collection_get_selected_sources (_tmp18_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = add_tags_command_new (_tmp16_, _tmp14_, _tmp20_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = _tmp21_;
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp18_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp12_);
-#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp10_);
-#line 5070 "MediaPage.c"
+#line 5119 "MediaPage.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 5076 "MediaPage.c"
+#line 5125 "MediaPage.c"
 }
 
 
@@ -5101,93 +5150,93 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	GeeArrayList* _tmp18_ = NULL;
 	ModifyTagsCommand* _tmp19_ = NULL;
 	ModifyTagsCommand* _tmp20_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 693 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5121 "MediaPage.c"
+#line 5170 "MediaPage.c"
 	}
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media = _tmp9_;
-#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = media;
-#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = modify_tags_dialog_new (_tmp10_);
-#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp11_;
-#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = dialog;
-#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = modify_tags_dialog_execute (_tmp12_);
-#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_tags = _tmp13_;
-#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = new_tags;
-#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp14_ == NULL) {
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (new_tags);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (media);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5165 "MediaPage.c"
+#line 5214 "MediaPage.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = media;
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = new_tags;
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = modify_tags_command_new (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp20_);
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp16_);
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (new_tags);
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 5191 "MediaPage.c"
+#line 5240 "MediaPage.c"
 }
 
 
@@ -5201,45 +5250,45 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/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 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = display;
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
-#line 5243 "MediaPage.c"
+#line 5292 "MediaPage.c"
 }
 
 
@@ -5248,21 +5297,21 @@ static void media_page_on_new_event (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 5266 "MediaPage.c"
+#line 5315 "MediaPage.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -5271,33 +5320,33 @@ static void media_page_on_new_event (MediaPage* self) {
 		GeeList* _tmp9_ = NULL;
 		NewEventCommand* _tmp10_ = NULL;
 		NewEventCommand* _tmp11_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = view_collection_get_selected (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _tmp8_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 5301 "MediaPage.c"
+#line 5350 "MediaPage.c"
 	}
 }
 
@@ -5319,52 +5368,52 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	gboolean _tmp23_ = FALSE;
 	FlagUnflagCommand* _tmp24_ = NULL;
 	FlagUnflagCommand* _tmp25_ = NULL;
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5339 "MediaPage.c"
+#line 5388 "MediaPage.c"
 	}
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_MEDIA_SOURCE);
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sources = _tmp7_;
-#line 727 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 5355 "MediaPage.c"
+#line 5404 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = sources;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_source_it = _tmp9_;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5368 "MediaPage.c"
+#line 5417 "MediaPage.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			MediaSource* source = NULL;
@@ -5375,90 +5424,90 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			Flaggable* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			Flaggable* _tmp17_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _source_it;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp11_) {
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5387 "MediaPage.c"
+#line 5436 "MediaPage.c"
 			}
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _source_it;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			source = (MediaSource*) _tmp13_;
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = source;
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			flaggable = _tmp15_;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = flaggable;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp17_ != NULL) {
-#line 5405 "MediaPage.c"
+#line 5454 "MediaPage.c"
 				Flaggable* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = flaggable;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp19_ = flaggable_is_flagged (_tmp18_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = !_tmp19_;
-#line 5414 "MediaPage.c"
+#line 5463 "MediaPage.c"
 			} else {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = FALSE;
-#line 5418 "MediaPage.c"
+#line 5467 "MediaPage.c"
 			}
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp16_) {
-#line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				flag = TRUE;
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (flaggable);
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (source);
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5430 "MediaPage.c"
+#line 5479 "MediaPage.c"
 			}
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 5436 "MediaPage.c"
+#line 5485 "MediaPage.c"
 		}
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 5440 "MediaPage.c"
+#line 5489 "MediaPage.c"
 	}
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = _tmp20_;
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = sources;
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = flag;
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = flag_unflag_command_new (_tmp22_, _tmp23_);
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = _tmp24_;
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp21_);
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 5462 "MediaPage.c"
+#line 5511 "MediaPage.c"
 }
 
 
@@ -5477,64 +5526,64 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	SetRatingCommand* _tmp12_ = NULL;
-#line 741 "/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 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 742 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5495 "MediaPage.c"
+#line 5544 "MediaPage.c"
 	}
-#line 744 "/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 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 744 "/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), TRUE);
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 745 "/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 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 745 "/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 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5529 "MediaPage.c"
+#line 5578 "MediaPage.c"
 }
 
 
 void media_page_on_increase_rating (MediaPage* self) {
-#line 740 "/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 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 5538 "MediaPage.c"
+#line 5587 "MediaPage.c"
 }
 
 
@@ -5553,64 +5602,64 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	SetRatingCommand* _tmp12_ = NULL;
-#line 751 "/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 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5571 "MediaPage.c"
+#line 5620 "MediaPage.c"
 	}
-#line 754 "/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 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/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 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 757 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5605 "MediaPage.c"
+#line 5654 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_rating (MediaPage* self) {
-#line 750 "/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 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 5614 "MediaPage.c"
+#line 5663 "MediaPage.c"
 }
 
 
@@ -5630,178 +5679,178 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	CommandManager* _tmp11_ = NULL;
 	CommandManager* _tmp12_ = NULL;
 	SetRatingCommand* _tmp13_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5648 "MediaPage.c"
+#line 5697 "MediaPage.c"
 	}
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = rating;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), _tmp8_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp10_;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = command;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 767 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5684 "MediaPage.c"
+#line 5733 "MediaPage.c"
 }
 
 
 void media_page_on_set_rating (MediaPage* self, Rating rating) {
-#line 760 "/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 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 5693 "MediaPage.c"
+#line 5742 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_rejected (MediaPage* self) {
-#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 5700 "MediaPage.c"
+#line 5749 "MediaPage.c"
 }
 
 
 void media_page_on_rate_rejected (MediaPage* self) {
-#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 5709 "MediaPage.c"
+#line 5758 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_unrated (MediaPage* self) {
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 5716 "MediaPage.c"
+#line 5765 "MediaPage.c"
 }
 
 
 void media_page_on_rate_unrated (MediaPage* self) {
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 5725 "MediaPage.c"
+#line 5774 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_one (MediaPage* self) {
-#line 779 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 5732 "MediaPage.c"
+#line 5781 "MediaPage.c"
 }
 
 
 void media_page_on_rate_one (MediaPage* self) {
-#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 5741 "MediaPage.c"
+#line 5790 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_two (MediaPage* self) {
-#line 783 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 5748 "MediaPage.c"
+#line 5797 "MediaPage.c"
 }
 
 
 void media_page_on_rate_two (MediaPage* self) {
-#line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 5757 "MediaPage.c"
+#line 5806 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_three (MediaPage* self) {
-#line 787 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 5764 "MediaPage.c"
+#line 5813 "MediaPage.c"
 }
 
 
 void media_page_on_rate_three (MediaPage* self) {
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 5773 "MediaPage.c"
+#line 5822 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_four (MediaPage* self) {
-#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 5780 "MediaPage.c"
+#line 5829 "MediaPage.c"
 }
 
 
 void media_page_on_rate_four (MediaPage* self) {
-#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 5789 "MediaPage.c"
+#line 5838 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_five (MediaPage* self) {
-#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 5796 "MediaPage.c"
+#line 5845 "MediaPage.c"
 }
 
 
 void media_page_on_rate_five (MediaPage* self) {
-#line 794 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 794 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 5805 "MediaPage.c"
+#line 5854 "MediaPage.c"
 }
 
 
@@ -5810,23 +5859,23 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	remove_photos_from_library (_tmp3_);
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 5830 "MediaPage.c"
+#line 5879 "MediaPage.c"
 }
 
 
@@ -5839,55 +5888,55 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp18_ = FALSE;
 	CheckerboardItem* _tmp19_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	restore_point = NULL;
-#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 5849 "MediaPage.c"
+#line 5898 "MediaPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		DataView* _tmp4_ = NULL;
 		CheckerboardItem* _tmp5_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = view_collection_get_next (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView));
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp4_) : NULL;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp5_ == NULL) {
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 5869 "MediaPage.c"
+#line 5918 "MediaPage.c"
 		}
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		restore_point = _tmp5_;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 5877 "MediaPage.c"
+#line 5926 "MediaPage.c"
 	}
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_ > 0;
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_) {
-#line 5891 "MediaPage.c"
+#line 5940 "MediaPage.c"
 		CommandManager* _tmp10_ = NULL;
 		CommandManager* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
@@ -5896,83 +5945,83 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		GeeCollection* _tmp15_ = NULL;
 		TrashUntrashPhotosCommand* _tmp16_ = NULL;
 		TrashUntrashPhotosCommand* _tmp17_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = view_collection_get_selected_sources (_tmp13_);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = trash_untrash_photos_command_new (_tmp15_, TRUE);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _tmp16_;
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp11_);
-#line 5926 "MediaPage.c"
+#line 5975 "MediaPage.c"
 	}
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = restore_point;
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_ != NULL) {
-#line 5932 "MediaPage.c"
+#line 5981 "MediaPage.c"
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		CheckerboardItem* _tmp22_ = NULL;
 		gboolean _tmp23_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = restore_point;
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/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 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp23_;
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 5949 "MediaPage.c"
+#line 5998 "MediaPage.c"
 	} else {
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = FALSE;
-#line 5953 "MediaPage.c"
+#line 6002 "MediaPage.c"
 	}
-#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp18_) {
-#line 5957 "MediaPage.c"
+#line 6006 "MediaPage.c"
 		CheckerboardItem* _tmp24_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = restore_point;
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp24_);
-#line 5963 "MediaPage.c"
+#line 6012 "MediaPage.c"
 	}
-#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 5967 "MediaPage.c"
+#line 6016 "MediaPage.c"
 }
 
 
 void media_page_on_move_to_trash (MediaPage* self) {
-#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 5976 "MediaPage.c"
+#line 6025 "MediaPage.c"
 }
 
 
@@ -5998,107 +6047,107 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	EditTitleDialog* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
 	const gchar* _tmp17_ = NULL;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6016 "MediaPage.c"
+#line 6065 "MediaPage.c"
 	}
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_title (_tmp10_);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_title_dialog_new (_tmp12_);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_title_dialog = _tmp14_;
-#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_title_dialog;
-#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_title_dialog_execute (_tmp15_);
-#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_title = _tmp16_;
-#line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_title;
-#line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6060 "MediaPage.c"
+#line 6109 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		EditMultipleTitlesCommand* _tmp22_ = NULL;
 		EditMultipleTitlesCommand* _tmp23_ = NULL;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_title;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/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 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6085 "MediaPage.c"
+#line 6134 "MediaPage.c"
 	}
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6093 "MediaPage.c"
+#line 6142 "MediaPage.c"
 }
 
 
 void media_page_on_edit_title (MediaPage* self) {
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 6102 "MediaPage.c"
+#line 6151 "MediaPage.c"
 }
 
 
@@ -6124,107 +6173,107 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	EditCommentDialog* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
 	const gchar* _tmp17_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6142 "MediaPage.c"
+#line 6191 "MediaPage.c"
 	}
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_comment (_tmp10_);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_comment_dialog_new (_tmp12_, FALSE);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_comment_dialog = _tmp14_;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_comment_dialog;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_comment_dialog_execute (_tmp15_);
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_comment = _tmp16_;
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_comment;
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6186 "MediaPage.c"
+#line 6235 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		EditMultipleCommentsCommand* _tmp22_ = NULL;
 		EditMultipleCommentsCommand* _tmp23_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_comment;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/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 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6211 "MediaPage.c"
+#line 6260 "MediaPage.c"
 	}
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6219 "MediaPage.c"
+#line 6268 "MediaPage.c"
 }
 
 
 void media_page_on_edit_comment (MediaPage* self) {
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 6228 "MediaPage.c"
+#line 6277 "MediaPage.c"
 }
 
 
@@ -6236,40 +6285,40 @@ static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* a
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/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"
+#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 846 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/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 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6264 "MediaPage.c"
+#line 6313 "MediaPage.c"
 }
 
 
 void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
-#line 6273 "MediaPage.c"
+#line 6322 "MediaPage.c"
 }
 
 
@@ -6281,40 +6330,40 @@ static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction*
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 862 "/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"
+#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 867 "/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 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6309 "MediaPage.c"
+#line 6358 "MediaPage.c"
 }
 
 
 void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
-#line 6318 "MediaPage.c"
+#line 6367 "MediaPage.c"
 }
 
 
@@ -6326,40 +6375,40 @@ static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction*
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 871 "/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"
+#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 864 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, display);
-#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 876 "/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 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6354 "MediaPage.c"
+#line 6403 "MediaPage.c"
 }
 
 
 void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
-#line 6363 "MediaPage.c"
+#line 6412 "MediaPage.c"
 }
 
 
@@ -6371,76 +6420,76 @@ static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* act
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 880 "/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"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 873 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, display);
-#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/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 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6399 "MediaPage.c"
+#line 6448 "MediaPage.c"
 }
 
 
 void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
-#line 6408 "MediaPage.c"
+#line 6457 "MediaPage.c"
 }
 
 
 static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 889 "/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 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6417 "MediaPage.c"
+#line 6466 "MediaPage.c"
 }
 
 
 void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 6426 "MediaPage.c"
+#line 6475 "MediaPage.c"
 }
 
 
 static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 891 "/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 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6435 "MediaPage.c"
+#line 6484 "MediaPage.c"
 }
 
 
 void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 6444 "MediaPage.c"
+#line 6493 "MediaPage.c"
 }
 
 
@@ -6451,54 +6500,36 @@ static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* act
 	gint _tmp2_ = 0;
 	gboolean sort_order = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 893 "/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"
+#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = action;
-#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = value;
-#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_get_menu_sort_by (self);
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp2_;
-#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_get_menu_sort_order (self);
-#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_order = _tmp3_;
-#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_order);
-#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 6475 "MediaPage.c"
+#line 6524 "MediaPage.c"
 }
 
 
 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 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
-#line 6484 "MediaPage.c"
-}
-
-
-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 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_developer_changed (self, RAW_DEVELOPER_SHOTWELL);
-#line 6493 "MediaPage.c"
-}
-
-
-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 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_developer_changed (self, RAW_DEVELOPER_CAMERA);
-#line 6502 "MediaPage.c"
+#line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
+#line 6533 "MediaPage.c"
 }
 
 
@@ -6508,78 +6539,78 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GQuark _tmp4_ = 0U;
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label0 = 0;
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 6516 "MediaPage.c"
+#line 6547 "MediaPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 903 "/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;
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	developer = RAW_DEVELOPER_SHOTWELL;
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/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"
+#line 907 "/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"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6538 "MediaPage.c"
+#line 6569 "MediaPage.c"
 			default:
 			{
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6545 "MediaPage.c"
+#line 6576 "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"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6551 "MediaPage.c"
+#line 6582 "MediaPage.c"
 			default:
 			{
-#line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
-#line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6558 "MediaPage.c"
+#line 6589 "MediaPage.c"
 			}
 		}
 	} else {
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6564 "MediaPage.c"
+#line 6595 "MediaPage.c"
 			default:
 			{
-#line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6569 "MediaPage.c"
+#line 6600 "MediaPage.c"
 			}
 		}
 	}
-#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 918 "/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"
+	media_page_developer_changed (self, _tmp5_);
+#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = action;
-#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = value;
-#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 6583 "MediaPage.c"
+#line 6614 "MediaPage.c"
 }
 
 
@@ -6593,29 +6624,29 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	GeeArrayList* _tmp4_ = NULL;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/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 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6611 "MediaPage.c"
+#line 6642 "MediaPage.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
-#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/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 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	to_set = _tmp4_;
-#line 6619 "MediaPage.c"
+#line 6650 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -6627,31 +6658,31 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _view_index = 0;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = view_collection_get_selected (_tmp6_);
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp8_;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _view_list;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp11_;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 6655 "MediaPage.c"
+#line 6686 "MediaPage.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -6665,128 +6696,128 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			Photo* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			Photo* _tmp22_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _view_index;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp12_ + 1;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = _view_index;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_size;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6681 "MediaPage.c"
+#line 6712 "MediaPage.c"
 			}
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_list;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_index;
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp17_;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = view;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = data_view_get_source (_tmp18_);
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp20_ == NULL) {
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp19_);
-#line 6701 "MediaPage.c"
+#line 6732 "MediaPage.c"
 			}
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			p = _tmp20_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = p;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ != NULL) {
-#line 6709 "MediaPage.c"
+#line 6740 "MediaPage.c"
 				RawDeveloper _tmp23_ = 0;
 				Photo* _tmp24_ = NULL;
 				RawDeveloper _tmp25_ = 0;
 				gboolean _tmp26_ = FALSE;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = rd;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = p;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo_get_raw_developer (_tmp24_);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = !_tmp26_;
-#line 6724 "MediaPage.c"
+#line 6755 "MediaPage.c"
 			} else {
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = FALSE;
-#line 6728 "MediaPage.c"
+#line 6759 "MediaPage.c"
 			}
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp21_) {
-#line 6732 "MediaPage.c"
+#line 6763 "MediaPage.c"
 				GeeArrayList* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
 				Photo* _tmp29_ = NULL;
 				gboolean _tmp30_ = FALSE;
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = to_set;
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp28_ = view;
-#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 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
+#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp29_ = p;
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp30_ = photo_has_transformations (_tmp29_);
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp30_) {
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 6751 "MediaPage.c"
+#line 6782 "MediaPage.c"
 				}
 			}
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6758 "MediaPage.c"
+#line 6789 "MediaPage.c"
 		}
-#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6762 "MediaPage.c"
+#line 6793 "MediaPage.c"
 	}
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = need_warn;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (!_tmp32_) {
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = TRUE;
-#line 6770 "MediaPage.c"
+#line 6801 "MediaPage.c"
 	} else {
 		GeeArrayList* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
 		gboolean _tmp36_ = FALSE;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = to_set;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp35_ = _tmp34_;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = _tmp36_;
-#line 6786 "MediaPage.c"
+#line 6817 "MediaPage.c"
 	}
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 6790 "MediaPage.c"
+#line 6821 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		GeeArrayList* _tmp37_ = NULL;
 		RawDeveloper _tmp38_ = 0;
@@ -6794,42 +6825,42 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		CommandManager* _tmp40_ = NULL;
 		CommandManager* _tmp41_ = NULL;
 		SetRawDeveloperCommand* _tmp42_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp37_ = to_set;
-#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp38_ = rd;
-#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/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 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command = _tmp39_;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp40_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp41_ = _tmp40_;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp42_ = command;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_COMMAND, Command));
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp41_);
 #line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_command_manager_unref0 (_tmp41_);
+#line 949 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_update_development_menu_item_sensitivity (self);
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 6820 "MediaPage.c"
+#line 6851 "MediaPage.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 6824 "MediaPage.c"
+#line 6855 "MediaPage.c"
 }
 
 
 void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 6833 "MediaPage.c"
+#line 6864 "MediaPage.c"
 }
 
 
@@ -6837,17 +6868,17 @@ static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean
 	MediaPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#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 954 "/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 956 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = display;
-#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 6851 "MediaPage.c"
+#line 6882 "MediaPage.c"
 }
 
 
@@ -6855,17 +6886,17 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole
 	MediaPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 957 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#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 960 "/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 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = display;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
-#line 6869 "MediaPage.c"
+#line 6900 "MediaPage.c"
 }
 
 
@@ -6873,19 +6904,19 @@ 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"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/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"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	action = _tmp0_;
-#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6889 "MediaPage.c"
+#line 6920 "MediaPage.c"
 }
 
 
@@ -6893,19 +6924,19 @@ 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"
+#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 970 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/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"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	action = _tmp0_;
-#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6909 "MediaPage.c"
+#line 6940 "MediaPage.c"
 }
 
 
@@ -6918,38 +6949,38 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 	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 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_by_title_action (self);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = g_action_get_state (_tmp1_);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = atoi (_tmp4_);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp6_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6946 "MediaPage.c"
+#line 6977 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new30 (const gchar* value) {
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6953 "MediaPage.c"
+#line 6984 "MediaPage.c"
 }
 
 
@@ -6960,29 +6991,29 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 	GAction* _tmp2_ = NULL;
 	GAction* _tmp3_ = NULL;
 	GVariant* _tmp4_ = NULL;
-#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = val;
-#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_strdup_printf ("%d", _tmp0_);
-#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort = _tmp1_;
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_by_title_action (self);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _variant_new30 (sort);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp3_, _tmp4_);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp4_);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (sort);
-#line 6986 "MediaPage.c"
+#line 7017 "MediaPage.c"
 }
 
 
@@ -6994,36 +7025,36 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	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 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_ascending_action (self);
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = g_action_get_state (_tmp1_);
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "ascending") == 0;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp5_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7020 "MediaPage.c"
+#line 7051 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new31 (const gchar* value) {
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 7027 "MediaPage.c"
+#line 7058 "MediaPage.c"
 }
 
 
@@ -7033,141 +7064,141 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	GAction* _tmp2_ = NULL;
 	GAction* _tmp3_ = NULL;
 	GVariant* _tmp4_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = ascending;
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_) {
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "ascending";
-#line 7045 "MediaPage.c"
+#line 7076 "MediaPage.c"
 	} else {
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "descending";
-#line 7049 "MediaPage.c"
+#line 7080 "MediaPage.c"
 	}
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_ascending_action (self);
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _variant_new31 (_tmp0_);
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp3_, _tmp4_);
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp4_);
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 7063 "MediaPage.c"
+#line 7094 "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 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7072 "MediaPage.c"
+#line 7103 "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 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7081 "MediaPage.c"
+#line 7112 "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 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7090 "MediaPage.c"
+#line 7121 "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 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7099 "MediaPage.c"
+#line 7130 "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 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7108 "MediaPage.c"
+#line 7139 "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 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7117 "MediaPage.c"
+#line 7148 "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 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7126 "MediaPage.c"
+#line 7157 "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 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7135 "MediaPage.c"
+#line 7166 "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 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7144 "MediaPage.c"
+#line 7175 "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 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7153 "MediaPage.c"
+#line 7184 "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 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7162 "MediaPage.c"
+#line 7193 "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 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7171 "MediaPage.c"
+#line 7202 "MediaPage.c"
 }
 
 
@@ -7185,329 +7216,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 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = sort_by;
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	switch (_tmp0_) {
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 7197 "MediaPage.c"
+#line 7228 "MediaPage.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp1_ = ascending;
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp1_) {
-#line 1001 "/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 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_ascending_comparator_comparator;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7218 "MediaPage.c"
+#line 7249 "MediaPage.c"
 			} else {
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7234 "MediaPage.c"
+#line 7265 "MediaPage.c"
 			}
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7252 "MediaPage.c"
+#line 7283 "MediaPage.c"
 		}
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 7256 "MediaPage.c"
+#line 7287 "MediaPage.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp2_ = ascending;
-#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp2_) {
-#line 1008 "/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 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_ascending_comparator_comparator;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7277 "MediaPage.c"
+#line 7308 "MediaPage.c"
 			} else {
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_desending_comparator_comparator;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7293 "MediaPage.c"
+#line 7324 "MediaPage.c"
 			}
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_exposure_time_comparator_predicate_comparator_predicate;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7311 "MediaPage.c"
+#line 7342 "MediaPage.c"
 		}
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 7315 "MediaPage.c"
+#line 7346 "MediaPage.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp3_ = ascending;
-#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp3_) {
-#line 1015 "/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 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_ascending_comparator_comparator;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7336 "MediaPage.c"
+#line 7367 "MediaPage.c"
 			} else {
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_descending_comparator_comparator;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7352 "MediaPage.c"
+#line 7383 "MediaPage.c"
 			}
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_rating_comparator_predicate_comparator_predicate;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1020 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7370 "MediaPage.c"
+#line 7401 "MediaPage.c"
 		}
-#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 7374 "MediaPage.c"
+#line 7405 "MediaPage.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp4_ = ascending;
-#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp4_) {
-#line 1022 "/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 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_ascending_comparator_comparator;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7395 "MediaPage.c"
+#line 7426 "MediaPage.c"
 			} else {
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_descending_comparator_comparator;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7411 "MediaPage.c"
+#line 7442 "MediaPage.c"
 			}
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_filename_comparator_predicate_comparator_predicate;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7429 "MediaPage.c"
+#line 7460 "MediaPage.c"
 		}
 		default:
 		{
 			gint _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp5_ = media_page_get_menu_sort_by (self);
-#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _tmp6_;
-#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			g_debug ("MediaPage.vala:1028: Unknown sort criteria: %s", _tmp7_);
-#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+			g_debug ("MediaPage.vala:1030: Unknown sort criteria: %s", _tmp7_);
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_free0 (_tmp7_);
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7476 "MediaPage.c"
+#line 7507 "MediaPage.c"
 		}
 	}
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = comparator;
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10__target = comparator_target;
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = predicate;
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11__target = predicate_target;
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/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 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate = NULL;
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target = NULL;
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target_destroy_notify = NULL;
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator = NULL;
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target = NULL;
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 7511 "MediaPage.c"
+#line 7542 "MediaPage.c"
 }
 
 
@@ -7516,106 +7547,106 @@ void media_page_sync_sort (MediaPage* self) {
 	gint sort_by = 0;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
-#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_ascending = _tmp0_;
-#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_by = _tmp1_;
 #line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_by = _tmp1_;
+#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_by (self, sort_by);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_set_menu_sort_order (self, sort_ascending);
 #line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_set_menu_sort_order (self, sort_ascending);
+#line 1061 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 7534 "MediaPage.c"
+#line 7565 "MediaPage.c"
 }
 
 
 static void media_page_real_destroy (GtkWidget* base) {
 	MediaPage * self;
-#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_disconnect_slider (self);
 #line 1065 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_disconnect_slider (self);
+#line 1067 "/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 7546 "MediaPage.c"
+#line 7577 "MediaPage.c"
 }
 
 
 void media_page_increase_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7558 "MediaPage.c"
+#line 7589 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 7564 "MediaPage.c"
+#line 7595 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_);
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7582 "MediaPage.c"
+#line 7613 "MediaPage.c"
 	}
 }
 
 
 void media_page_decrease_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7595 "MediaPage.c"
+#line 7626 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 7601 "MediaPage.c"
+#line 7632 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7619 "MediaPage.c"
+#line 7650 "MediaPage.c"
 	}
 }
 
@@ -7625,28 +7656,28 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource*
 	DataSource* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	Thumbnail* _tmp2_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = source;
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7641 "MediaPage.c"
+#line 7672 "MediaPage.c"
 }
 
 
 DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 7650 "MediaPage.c"
+#line 7681 "MediaPage.c"
 }
 
 
@@ -7677,104 +7708,104 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	gint _tmp26_ = 0;
-#line 1094 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = new_scale;
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 7691 "MediaPage.c"
+#line 7722 "MediaPage.c"
 	} else {
 		gboolean _tmp3_ = FALSE;
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 7698 "MediaPage.c"
+#line 7729 "MediaPage.c"
 	}
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7704 "MediaPage.c"
+#line 7735 "MediaPage.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = new_scale;
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = thumbnail_get_MIN_SCALE ();
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MAX_SCALE ();
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_);
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_scale = _tmp9_;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = new_scale;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_layout_set_scale (_tmp11_, _tmp12_);
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_scale;
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp18_, G_TYPE_INT);
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_int (&_tmp18_, _tmp17_);
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/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 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL;
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_data_collection_unref0 (_tmp20_);
 #line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_data_collection_unref0 (_tmp20_);
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = new_scale;
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = thumbnail_get_MAX_SCALE ();
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 1106 "/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), "IncreaseSize", _tmp21_ < _tmp23_);
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = new_scale;
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = thumbnail_get_MIN_SCALE ();
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp26_ = _tmp25_;
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 7778 "MediaPage.c"
+#line 7809 "MediaPage.c"
 }
 
 
@@ -7788,59 +7819,59 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	CheckerboardLayout* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 1110 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = checkerboard_layout_get_scale (_tmp1_);
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ <= 0;
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 7806 "MediaPage.c"
+#line 7837 "MediaPage.c"
 		CheckerboardLayout* _tmp4_ = NULL;
 		CheckerboardLayout* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/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 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_layout_set_scale (_tmp5_, _tmp8_);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 7828 "MediaPage.c"
+#line 7859 "MediaPage.c"
 	}
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = checkerboard_layout_get_scale (_tmp10_);
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp12_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7844 "MediaPage.c"
+#line 7875 "MediaPage.c"
 }
 
 
@@ -7849,14 +7880,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 7853 "MediaPage.c"
+#line 7884 "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 7860 "MediaPage.c"
+#line 7891 "MediaPage.c"
 }
 
 
@@ -7865,7 +7896,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 7869 "MediaPage.c"
+#line 7900 "MediaPage.c"
 }
 
 
@@ -8047,14 +8078,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 8051 "MediaPage.c"
+#line 8082 "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 8058 "MediaPage.c"
+#line 8089 "MediaPage.c"
 }
 
 
@@ -8095,7 +8126,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 8099 "MediaPage.c"
+#line 8130 "MediaPage.c"
 }
 
 
@@ -8133,7 +8164,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 8137 "MediaPage.c"
+#line 8168 "MediaPage.c"
 }
 
 
@@ -8149,7 +8180,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 8153 "MediaPage.c"
+#line 8184 "MediaPage.c"
 }
 
 
@@ -8165,7 +8196,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 8169 "MediaPage.c"
+#line 8200 "MediaPage.c"
 }
 
 
@@ -8174,7 +8205,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 8178 "MediaPage.c"
+#line 8209 "MediaPage.c"
 }
 
 
@@ -8195,7 +8226,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 8199 "MediaPage.c"
+#line 8230 "MediaPage.c"
 }
 
 
@@ -8216,7 +8247,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 8220 "MediaPage.c"
+#line 8251 "MediaPage.c"
 }
 
 
@@ -8245,7 +8276,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8249 "MediaPage.c"
+#line 8280 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8255,7 +8286,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 8259 "MediaPage.c"
+#line 8290 "MediaPage.c"
 }
 
 
@@ -8284,7 +8315,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8288 "MediaPage.c"
+#line 8319 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8294,7 +8325,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 8298 "MediaPage.c"
+#line 8329 "MediaPage.c"
 }
 
 
@@ -8315,7 +8346,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 8319 "MediaPage.c"
+#line 8350 "MediaPage.c"
 }
 
 
@@ -8335,7 +8366,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 8339 "MediaPage.c"
+#line 8370 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->slider;
@@ -8345,7 +8376,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 8349 "MediaPage.c"
+#line 8380 "MediaPage.c"
 }
 
 
@@ -8358,14 +8389,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 8362 "MediaPage.c"
+#line 8393 "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 8369 "MediaPage.c"
+#line 8400 "MediaPage.c"
 }
 
 
@@ -8379,7 +8410,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 8383 "MediaPage.c"
+#line 8414 "MediaPage.c"
 }
 
 
@@ -8405,6 +8436,8 @@ static void media_page_class_init (MediaPageClass * klass) {
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	((PageClass *) klass)->add_actions = media_page_real_add_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	((PageClass *) klass)->remove_actions = media_page_real_remove_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"
 	((CheckerboardPageClass *) klass)->get_view_tracker = media_page_real_get_view_tracker;
@@ -8478,7 +8511,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 8482 "MediaPage.c"
+#line 8515 "MediaPage.c"
 }
 
 
@@ -8489,7 +8522,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 8493 "MediaPage.c"
+#line 8526 "MediaPage.c"
 }
 
 
@@ -8505,7 +8538,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 8509 "MediaPage.c"
+#line 8542 "MediaPage.c"
 }
 
 
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index ee5ef0e..a2d5185 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -318,17 +318,16 @@ public abstract class MediaPage : CheckerboardPage {
         // 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 ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
         bool sort_order;
         int sort_by;
         get_config_photos_sort(out sort_order, out sort_by);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
         get_action ("ViewTitle").change_state (Config.Facade.get_instance ().get_display_photo_titles ());
         get_action ("ViewComment").change_state (Config.Facade.get_instance ().get_display_photo_comments ());
         get_action ("ViewRatings").change_state (Config.Facade.get_instance ().get_display_photo_ratings ());
@@ -337,9 +336,20 @@ public abstract class MediaPage : CheckerboardPage {
         get_action ("Sort").change_state (sort_order ? "ascending" : "descending");
 
         var d = Config.Facade.get_instance().get_default_raw_developer();
-        get_action ("RawDeveloper").change_state (d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
+        var action = new GLib.SimpleAction.stateful("RawDeveloper",
+                GLib.VariantType.STRING, d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
+        action.change_state.connect(on_raw_developer_changed);
+        action.set_enabled(true);
+        map.add_action(action);
     }
-    
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
     protected override void update_actions(int selected_count, int count) {
         set_action_sensitive("Export", selected_count > 0);
         set_action_sensitive("EditTitle", selected_count > 0);
@@ -890,14 +900,6 @@ public abstract class MediaPage : CheckerboardPage {
         set_config_photos_sort(sort_order, sort_by);
     }
     
-    public void on_raw_developer_shotwell() {
-        developer_changed(RawDeveloper.SHOTWELL);
-    }
-    
-    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;
diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index 3187c83..a858bc2 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.32.1, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.34.4, the Vala compiler
  * generated from MediaViewTracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index eff07e9..46ac165 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.32.1, the Vala compiler
+/* MetadataWriter.c generated by valac 0.34.4, the Vala compiler
  * generated from MetadataWriter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch549_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 __finally549;
-		__catch549_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"
 		}
-		__finally549:
+		__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 __catch550_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 __catch550_database_error;
+						goto __catch552_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally550;
-		__catch550_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"
 		}
-		__finally550:
+		__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 __catch551_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 __finally551;
-	__catch551_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"
 	}
-	__finally551:
+	__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 __catch552_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 __catch552_g_error;
+			goto __catch554_g_error;
 		}
 	}
-	goto __finally552;
-	__catch552_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"
 	}
-	__finally552:
+	__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 __finally553;
+				goto __finally555;
 			}
 		}
-		__finally553:
+		__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 __finally554;
+				goto __finally556;
 			}
 		}
-		__finally554:
+		__finally556:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index 35b129c..7466854 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,4 +1,4 @@
-/* NaturalCollate.c generated by valac 0.32.1, the Vala compiler
+/* NaturalCollate.c generated by valac 0.34.4, the Vala compiler
  * generated from NaturalCollate.vala, do not modify */
 
 
@@ -27,15 +27,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
 	glong _tmp0_ = 0L;
 	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 41 "NaturalCollate.c"
 }
@@ -45,15 +45,15 @@ static gint string_index_of_nth_char (const gchar* self, glong c) {
 	gint result = 0;
 	glong _tmp0_ = 0L;
 	gchar* _tmp1_ = NULL;
-#line 1136 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1136 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = c;
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_);
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = (gint) (_tmp1_ - ((gchar*) self));
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 59 "NaturalCollate.c"
 }
@@ -66,37 +66,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 82 "NaturalCollate.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 90 "NaturalCollate.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 102 "NaturalCollate.c"
 	}
@@ -116,112 +116,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 126 "NaturalCollate.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 132 "NaturalCollate.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 136 "NaturalCollate.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 140 "NaturalCollate.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 152 "NaturalCollate.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 162 "NaturalCollate.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 168 "NaturalCollate.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 182 "NaturalCollate.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 192 "NaturalCollate.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 198 "NaturalCollate.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 207 "NaturalCollate.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 227 "NaturalCollate.c"
 }
@@ -389,17 +389,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 405 "NaturalCollate.c"
 }
@@ -410,17 +410,17 @@ static gchar* g_unichar_to_string (gunichar self) {
 	gchar* str = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 7);
-#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	str = (gchar*) _tmp0_;
-#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = str;
-#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_unichar_to_utf8 (self, _tmp1_);
-#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = str;
-#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 426 "NaturalCollate.c"
 }
diff --git a/src/Orientation.c b/src/Orientation.c
index 3e2da2a..c5d5b8d 100644
--- a/src/Orientation.c
+++ b/src/Orientation.c
@@ -1,4 +1,4 @@
-/* Orientation.c generated by valac 0.32.1, the Vala compiler
+/* Orientation.c generated by valac 0.34.4, the Vala compiler
  * generated from Orientation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Page.c b/src/Page.c
index 1f4e67d..5729233 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.32.1, the Vala compiler
+/* Page.c generated by valac 0.34.4, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -13,8 +13,8 @@
 #include <string.h>
 #include <gee.h>
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <gio/gio.h>
+#include <gdk/gdk.h>
 #include <cairo.h>
 #include <glib/gi18n-lib.h>
 #include <float.h>
@@ -509,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -932,7 +933,6 @@ ViewCollection* view_collection_new (const gchar* name);
 ViewCollection* view_collection_construct (GType object_type, const gchar* name);
 gboolean page_on_context_keypress (Page* self);
 static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
-static void page_init_ui (Page* self);
 static void page_attach_view_signals (Page* self);
 static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self);
 static void page_real_destroy (GtkWidget* base);
@@ -974,9 +974,17 @@ 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);
+void page_remove_actions (Page* self, GActionMap* map);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void page_switched_to (Page* self);
 static void page_real_switched_to (Page* self);
 static void page_add_ui (Page* self);
+void page_add_actions (Page* self, GActionMap* map);
+gint view_collection_get_selected_count (ViewCollection* self);
+gint data_collection_get_count (DataCollection* self);
+void page_init_actions (Page* self, gint selected_count, gint count);
+void page_update_actions (Page* self, gint selected_count, gint count);
 static void page_update_modifiers (Page* self);
 void page_ready (Page* self);
 static void page_real_ready (Page* self);
@@ -986,8 +994,6 @@ 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);
 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);
@@ -1025,8 +1031,8 @@ 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);
-void page_add_actions (Page* self);
-static void page_real_add_actions (Page* self);
+static void page_real_add_actions (Page* self, GActionMap* map);
+static void page_real_remove_actions (Page* self, GActionMap* map);
 void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
 static gboolean _variant_get21 (GVariant* value);
 static GVariant* _variant_new22 (gboolean value);
@@ -1034,10 +1040,6 @@ 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);
 void page_init_toolbar (Page* self, const gchar* path);
-gint view_collection_get_selected_count (ViewCollection* self);
-gint data_collection_get_count (DataCollection* self);
-void page_init_actions (Page* self, gint selected_count, gint count);
-void page_update_actions (Page* self, gint selected_count, gint count);
 static void page_on_update_actions (Page* self);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_view_get_type (void) G_GNUC_CONST;
@@ -1504,14 +1506,14 @@ InjectionGroup* injection_group_construct (GType object_type, const gchar* path)
 	self->priv->path = _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1508 "Page.c"
+#line 1510 "Page.c"
 }
 
 
 InjectionGroup* injection_group_new (const gchar* path) {
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return injection_group_construct (TYPE_INJECTION_GROUP, path);
-#line 1515 "Page.c"
+#line 1517 "Page.c"
 }
 
 
@@ -1529,14 +1531,14 @@ gchar* injection_group_get_path (InjectionGroup* self) {
 	result = _tmp1_;
 #line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1533 "Page.c"
+#line 1535 "Page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1540 "Page.c"
+#line 1542 "Page.c"
 }
 
 
@@ -1554,7 +1556,7 @@ GeeList* injection_group_get_elements (InjectionGroup* self) {
 	result = _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1558 "Page.c"
+#line 1560 "Page.c"
 }
 
 
@@ -1585,7 +1587,7 @@ void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, con
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
 #line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp5_);
-#line 1589 "Page.c"
+#line 1591 "Page.c"
 }
 
 
@@ -1613,7 +1615,7 @@ void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gc
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp4_);
-#line 1617 "Page.c"
+#line 1619 "Page.c"
 }
 
 
@@ -1646,7 +1648,7 @@ void injection_group_add_separator (InjectionGroup* self) {
 	_injection_group_element_unref0 (_tmp5_);
 #line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp3_);
-#line 1650 "Page.c"
+#line 1652 "Page.c"
 }
 
 
@@ -1688,20 +1690,20 @@ InjectionGroupElement* injection_group_element_construct (GType object_type, con
 	_tmp3_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 1692 "Page.c"
+#line 1694 "Page.c"
 		const gchar* _tmp4_ = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp4_;
-#line 1698 "Page.c"
+#line 1700 "Page.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp5_;
-#line 1705 "Page.c"
+#line 1707 "Page.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -1723,21 +1725,21 @@ InjectionGroupElement* injection_group_element_construct (GType object_type, con
 	self->kind = _tmp9_;
 #line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1727 "Page.c"
+#line 1729 "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 1734 "Page.c"
+#line 1736 "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 1741 "Page.c"
+#line 1743 "Page.c"
 }
 
 
@@ -1746,7 +1748,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 1750 "Page.c"
+#line 1752 "Page.c"
 	}
 }
 
@@ -1756,11 +1758,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 1760 "Page.c"
+#line 1762 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1764 "Page.c"
+#line 1766 "Page.c"
 	}
 }
 
@@ -1768,37 +1770,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 1772 "Page.c"
+#line 1774 "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 1779 "Page.c"
+#line 1781 "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 1786 "Page.c"
+#line 1788 "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 1790 "Page.c"
+#line 1792 "Page.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_element_ref (object);
-#line 1794 "Page.c"
+#line 1796 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1798 "Page.c"
+#line 1800 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1802 "Page.c"
+#line 1804 "Page.c"
 }
 
 
@@ -1809,25 +1811,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 1813 "Page.c"
+#line 1815 "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 1819 "Page.c"
+#line 1821 "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 1823 "Page.c"
+#line 1825 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_element_ref (value->data[0].v_pointer);
-#line 1827 "Page.c"
+#line 1829 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1831 "Page.c"
+#line 1833 "Page.c"
 }
 
 
@@ -1841,7 +1843,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 1845 "Page.c"
+#line 1847 "Page.c"
 }
 
 
@@ -1850,7 +1852,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 1854 "Page.c"
+#line 1856 "Page.c"
 }
 
 
@@ -1870,17 +1872,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 1874 "Page.c"
+#line 1876 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1878 "Page.c"
+#line 1880 "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 1884 "Page.c"
+#line 1886 "Page.c"
 	}
 }
 
@@ -1899,17 +1901,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 1903 "Page.c"
+#line 1905 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1907 "Page.c"
+#line 1909 "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 1913 "Page.c"
+#line 1915 "Page.c"
 	}
 }
 
@@ -1919,14 +1921,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 1923 "Page.c"
+#line 1925 "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 1930 "Page.c"
+#line 1932 "Page.c"
 }
 
 
@@ -1942,7 +1944,7 @@ static void injection_group_element_finalize (InjectionGroupElement* obj) {
 	_g_free0 (self->action);
 #line 16 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->accellerator);
-#line 1946 "Page.c"
+#line 1948 "Page.c"
 }
 
 
@@ -1967,7 +1969,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 1971 "Page.c"
+#line 1973 "Page.c"
 }
 
 
@@ -1980,7 +1982,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 1984 "Page.c"
+#line 1986 "Page.c"
 	}
 }
 
@@ -1988,7 +1990,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 1992 "Page.c"
+#line 1994 "Page.c"
 }
 
 
@@ -1997,7 +1999,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 2001 "Page.c"
+#line 2003 "Page.c"
 	}
 }
 
@@ -2007,11 +2009,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 2011 "Page.c"
+#line 2013 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2015 "Page.c"
+#line 2017 "Page.c"
 	}
 }
 
@@ -2019,37 +2021,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 2023 "Page.c"
+#line 2025 "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 2030 "Page.c"
+#line 2032 "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 2037 "Page.c"
+#line 2039 "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 2041 "Page.c"
+#line 2043 "Page.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_ref (object);
-#line 2045 "Page.c"
+#line 2047 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2049 "Page.c"
+#line 2051 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2053 "Page.c"
+#line 2055 "Page.c"
 }
 
 
@@ -2060,25 +2062,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 2064 "Page.c"
+#line 2066 "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 2070 "Page.c"
+#line 2072 "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 2074 "Page.c"
+#line 2076 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_ref (value->data[0].v_pointer);
-#line 2078 "Page.c"
+#line 2080 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2082 "Page.c"
+#line 2084 "Page.c"
 }
 
 
@@ -2092,7 +2094,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 2096 "Page.c"
+#line 2098 "Page.c"
 }
 
 
@@ -2101,7 +2103,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 2105 "Page.c"
+#line 2107 "Page.c"
 }
 
 
@@ -2121,17 +2123,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 2125 "Page.c"
+#line 2127 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2129 "Page.c"
+#line 2131 "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 2135 "Page.c"
+#line 2137 "Page.c"
 	}
 }
 
@@ -2150,17 +2152,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 2154 "Page.c"
+#line 2156 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2158 "Page.c"
+#line 2160 "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 2164 "Page.c"
+#line 2166 "Page.c"
 	}
 }
 
@@ -2172,7 +2174,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 2176 "Page.c"
+#line 2178 "Page.c"
 }
 
 
@@ -2188,7 +2190,7 @@ static void injection_group_instance_init (InjectionGroup * self) {
 	self->priv->separator_id = 0;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 2192 "Page.c"
+#line 2194 "Page.c"
 }
 
 
@@ -2202,7 +2204,7 @@ static void injection_group_finalize (InjectionGroup* obj) {
 	_g_free0 (self->priv->path);
 #line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->elements);
-#line 2206 "Page.c"
+#line 2208 "Page.c"
 }
 
 
@@ -2227,7 +2229,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 2231 "Page.c"
+#line 2233 "Page.c"
 }
 
 
@@ -2240,7 +2242,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 2244 "Page.c"
+#line 2246 "Page.c"
 	}
 }
 
@@ -2250,14 +2252,14 @@ static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sen
 	result = page_on_context_keypress ((Page*) self);
 #line 98 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2254 "Page.c"
+#line 2256 "Page.c"
 }
 
 
 static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 100 "/home/jens/Source/shotwell/src/Page.vala"
 	page_attach_view_signals ((Page*) self);
-#line 2261 "Page.c"
+#line 2263 "Page.c"
 }
 
 
@@ -2307,8 +2309,6 @@ Page* page_construct (GType object_type, const gchar* page_name) {
 #line 98 "/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 100 "/home/jens/Source/shotwell/src/Page.vala"
-	page_init_ui (self);
-#line 102 "/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 89 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
@@ -2324,61 +2324,61 @@ static void page_real_destroy (GtkWidget* base) {
 	OneShotScheduler* _tmp4_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 111 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE, Page);
-#line 114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 112 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 112 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 113 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
 #line 2336 "Page.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 116 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_event_source (self);
-#line 119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 117 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_view_signals (self);
-#line 120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 118 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->view;
-#line 120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 118 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 121 "/home/jens/Source/shotwell/src/Page.vala"
 	page_clear_container (self);
-#line 125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 123 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->toolbar;
-#line 125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 123 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
 #line 2352 "Page.c"
 		GtkToolbar* _tmp3_ = NULL;
-#line 126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 124 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->toolbar;
-#line 126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 124 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 2358 "Page.c"
 	}
-#line 129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 127 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->update_actions_scheduler;
-#line 129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 127 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
 #line 2364 "Page.c"
 		OneShotScheduler* _tmp5_ = NULL;
-#line 130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 128 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->update_actions_scheduler;
-#line 130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 128 "/home/jens/Source/shotwell/src/Page.vala"
 		one_shot_scheduler_cancel (_tmp5_);
 #line 2370 "Page.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 130 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = TRUE;
-#line 134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 132 "/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 136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 134 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_page_name (self);
-#line 136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 134 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 136 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:136: Page %s Destroyed", _tmp7_);
-#line 136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 134 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:134: Page %s Destroyed", _tmp7_);
+#line 134 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp7_);
 #line 2384 "Page.c"
 }
@@ -2388,15 +2388,15 @@ gchar* page_get_page_name (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 137 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 138 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 138 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2402 "Page.c"
 }
@@ -2405,24 +2405,24 @@ gchar* page_get_page_name (Page* self) {
 static void page_real_set_page_name (Page* self, const gchar* page_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (page_name != NULL);
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 142 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 142 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 142 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 142 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
 #line 2419 "Page.c"
 }
 
 
 void page_set_page_name (Page* self, const gchar* page_name) {
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_name (self, page_name);
 #line 2428 "Page.c"
 }
@@ -2432,22 +2432,22 @@ gchar* page_to_string (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 146 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 146 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 146 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 146 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2446 "Page.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? data_collection_ref (self) : NULL;
 #line 2453 "Page.c"
 }
@@ -2457,15 +2457,15 @@ ViewCollection* page_get_view (Page* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->view;
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2471 "Page.c"
 }
@@ -2475,15 +2475,15 @@ GtkWindow* page_get_container (Page* self) {
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 154 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 154 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 154 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 154 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2489 "Page.c"
 }
@@ -2493,46 +2493,46 @@ static void page_real_set_container (Page* self, GtkWindow* container) {
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 158 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 158 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.container == null");
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = _tmp2_;
 #line 2511 "Page.c"
 }
 
 
 void page_set_container (Page* self, GtkWindow* container) {
-#line 159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_container (self, container);
 #line 2520 "Page.c"
 }
 
 
 static void page_real_clear_container (Page* self) {
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 164 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 164 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
 #line 2529 "Page.c"
 }
 
 
 void page_clear_container (Page* self) {
-#line 165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->clear_container (self);
 #line 2538 "Page.c"
 }
@@ -2541,7 +2541,7 @@ void page_clear_container (Page* self) {
 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 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 178 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2547 "Page.c"
 }
@@ -2550,7 +2550,7 @@ static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (
 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 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 179 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2556 "Page.c"
 }
@@ -2559,7 +2559,7 @@ static gboolean _page_on_button_released_internal_gtk_widget_button_release_even
 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 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2565 "Page.c"
 }
@@ -2568,7 +2568,7 @@ static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidg
 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 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2574 "Page.c"
 }
@@ -2577,14 +2577,14 @@ static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWi
 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 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2583 "Page.c"
 }
 
 
 static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_event_source_realize ((Page*) self);
 #line 2590 "Page.c"
 }
@@ -2602,53 +2602,53 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
 	GtkWidget* _tmp10_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 167 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 167 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WIDGET (event_source));
-#line 170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 168 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.event_source == null");
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event_source;
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 171 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event_source;
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 171 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_set_can_focus (_tmp3_, TRUE);
-#line 176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event_source;
-#line 176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 174 "/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 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event_source;
-#line 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 178 "/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 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 179 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event_source;
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 179 "/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 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event_source;
-#line 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/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 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = event_source;
-#line 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/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 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event_source;
-#line 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/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 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event_source;
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/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 2654 "Page.c"
 }
@@ -2666,51 +2666,51 @@ static void page_detach_event_source (Page* self) {
 	guint _tmp8_ = 0U;
 	GtkWidget* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 187 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 188 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
 #line 2678 "Page.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/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 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 191 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 191 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 191 "/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 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/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 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("leave-notify-event", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/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 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("scroll-event", gtk_widget_get_type (), &_tmp10_, NULL, FALSE);
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/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 198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	page_disable_drag_source (self);
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 198 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 198 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
 #line 2716 "Page.c"
 }
@@ -2720,22 +2720,22 @@ GtkWidget* page_get_event_source (Page* self) {
 	GtkWidget* result = NULL;
 	GtkWidget* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 201 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 202 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 202 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 202 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 202 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 2734 "Page.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? injection_group_ref (self) : NULL;
 #line 2741 "Page.c"
 }
@@ -2749,35 +2749,35 @@ GMenuModel* page_get_menubar (Page* self) {
 	GMenu* _tmp2_ = NULL;
 	GMenu* _tmp3_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 206 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 207 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->builder;
-#line 209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 207 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "MenuBar");
-#line 209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 207 "/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 209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 207 "/home/jens/Source/shotwell/src/Page.vala"
 	model = _tmp2_;
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 208 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = model;
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 208 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
 #line 2767 "Page.c"
 		GMenu* _tmp4_ = NULL;
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = g_menu_new ();
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_menu_model_get_type (), GMenuModel);
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
 #line 2777 "Page.c"
 	}
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 212 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->menubar_injected;
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 212 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp5_) {
 #line 2783 "Page.c"
 		InjectionGroup** injection_groups = NULL;
@@ -2787,17 +2787,17 @@ GMenuModel* page_get_menubar (Page* self) {
 		gint _injection_groups_size_ = 0;
 		InjectionGroup** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_init_collect_injection_groups (self, &_tmp6_);
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_groups = _tmp7_;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_groups_length1 = _tmp6_;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		_injection_groups_size_ = injection_groups_length1;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = injection_groups;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8__length1 = injection_groups_length1;
 #line 2803 "Page.c"
 		{
@@ -2805,41 +2805,41 @@ GMenuModel* page_get_menubar (Page* self) {
 			gint group_collection_length1 = 0;
 			gint _group_collection_size_ = 0;
 			gint group_it = 0;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 			group_collection = _tmp8_;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 			group_collection_length1 = _tmp8__length1;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 			for (group_it = 0; group_it < _tmp8__length1; group_it = group_it + 1) {
 #line 2815 "Page.c"
 				InjectionGroup* _tmp9_ = NULL;
 				InjectionGroup* group = NULL;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = _injection_group_ref0 (group_collection[group_it]);
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 				group = _tmp9_;
 #line 2822 "Page.c"
 				{
 					gint items = 0;
 					GMenu* _tmp10_ = NULL;
 					gint _tmp11_ = 0;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = model;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel));
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
 					items = _tmp11_;
 #line 2833 "Page.c"
 					{
 						gint i = 0;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 						i = 0;
 #line 2838 "Page.c"
 						{
 							gboolean _tmp12_ = FALSE;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp12_ = TRUE;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
 #line 2845 "Page.c"
 								gint _tmp14_ = 0;
@@ -2856,61 +2856,61 @@ GMenuModel* page_get_menubar (Page* self) {
 								GMenuModel* _tmp23_ = NULL;
 								GMenuModel* _tmp24_ = NULL;
 								GMenuModel* _tmp25_ = NULL;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp12_) {
 #line 2862 "Page.c"
 									gint _tmp13_ = 0;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp13_ = i;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									i = _tmp13_ + 1;
 #line 2868 "Page.c"
 								}
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp12_ = FALSE;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp14_ = i;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp15_ = items;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!(_tmp14_ < _tmp15_)) {
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
 #line 2880 "Page.c"
 								}
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp16_ = model;
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp17_ = i;
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp18_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, g_menu_model_get_type (), GMenuModel), _tmp17_, G_MENU_LINK_SUBMENU);
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp18_;
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp19_ = submenu;
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp20_ = group;
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = injection_group_get_path (_tmp20_);
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp22_ = _tmp21_;
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp23_ = page_find_extension_point (self, _tmp19_, _tmp22_);
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = _tmp23_;
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_free0 (_tmp22_);
-#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
 								section = _tmp24_;
-#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 223 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = section;
-#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 223 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp25_ == NULL) {
-#line 226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (submenu);
-#line 226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
 									continue;
 #line 2916 "Page.c"
 								}
@@ -2923,23 +2923,23 @@ GMenuModel* page_get_menubar (Page* self) {
 									gint _tmp29_ = 0;
 									gint _tmp30_ = 0;
 									gint _element_index = 0;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = group;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp27_ = injection_group_get_elements (_tmp26_);
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_element_list = _tmp27_;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp28_ = _element_list;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp30_ = _tmp29_;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_element_size = _tmp30_;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_element_index = -1;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									while (TRUE) {
 #line 2945 "Page.c"
 										gint _tmp31_ = 0;
@@ -2954,41 +2954,41 @@ GMenuModel* page_get_menubar (Page* self) {
 										GMenu* _tmp38_ = NULL;
 										InjectionGroupElement* _tmp39_ = NULL;
 										InjectionGroupElementItemType _tmp40_ = 0;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp31_ = _element_index;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_element_index = _tmp31_ + 1;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp32_ = _element_index;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp33_ = _element_size;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										if (!(_tmp32_ < _tmp33_)) {
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 											break;
 #line 2970 "Page.c"
 										}
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp34_ = _element_list;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp35_ = _element_index;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp36_ = gee_list_get (_tmp34_, _tmp35_);
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										element = (InjectionGroupElement*) _tmp36_;
-#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp37_ = section;
-#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, g_menu_get_type ()) ? ((GMenu*) _tmp37_) : NULL);
-#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
 										menu = _tmp38_;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp39_ = element;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp40_ = _tmp39_->kind;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 										switch (_tmp40_) {
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 											case INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM:
 #line 2994 "Page.c"
 											{
@@ -3005,98 +3005,98 @@ GMenuModel* page_get_menubar (Page* self) {
 												const gchar* _tmp50_ = NULL;
 												GMenu* _tmp54_ = NULL;
 												GMenuItem* _tmp55_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp41_ = element;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp42_ = _tmp41_->name;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp43_ = element;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp44_ = _tmp43_->action;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp45_ = g_strconcat ("win.", _tmp44_, NULL);
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp46_ = _tmp45_;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp47_ = g_menu_item_new (_tmp42_, _tmp46_);
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp48_ = _tmp47_;
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												_g_free0 (_tmp46_);
-#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 												item = _tmp48_;
-#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp49_ = element;
-#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp50_ = _tmp49_->accellerator;
-#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												if (_tmp50_ != NULL) {
 #line 3035 "Page.c"
 													GMenuItem* _tmp51_ = NULL;
 													InjectionGroupElement* _tmp52_ = NULL;
 													const gchar* _tmp53_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													_tmp51_ = item;
-#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													_tmp52_ = element;
-#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													_tmp53_ = _tmp52_->accellerator;
-#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													g_menu_item_set_attribute (_tmp51_, "accel", "s", _tmp53_, NULL);
 #line 3047 "Page.c"
 												}
-#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp54_ = menu;
-#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp55_ = item;
-#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
 												g_menu_append_item (_tmp54_, _tmp55_);
-#line 242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 240 "/home/jens/Source/shotwell/src/Page.vala"
 												_g_object_unref0 (item);
-#line 242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 240 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
 #line 3059 "Page.c"
 											}
 											default:
 											{
-#line 244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 242 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
 #line 3065 "Page.c"
 											}
 										}
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_g_object_unref0 (menu);
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_injection_group_element_unref0 (element);
 #line 3072 "Page.c"
 									}
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (_element_list);
 #line 3076 "Page.c"
 								}
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (section);
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
 #line 3082 "Page.c"
 							}
 						}
 					}
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
 					_injection_group_unref0 (group);
 #line 3088 "Page.c"
 				}
 			}
 		}
-#line 250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 248 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->menubar_injected = TRUE;
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+#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 3096 "Page.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 251 "/home/jens/Source/shotwell/src/Page.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (model, g_menu_model_get_type (), GMenuModel);
-#line 253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 251 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 3102 "Page.c"
 }
@@ -3107,9 +3107,9 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 	GtkToolbar* _tmp0_ = NULL;
 	GtkToolbar* _tmp12_ = NULL;
 	GtkToolbar* _tmp13_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->toolbar;
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
 #line 3115 "Page.c"
 		GtkToolbar* _tmp1_ = NULL;
@@ -3118,19 +3118,19 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 		GtkToolbar* _tmp9_ = NULL;
 		GtkStyleContext* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->toolbar_path;
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp2_ == NULL) {
 #line 3126 "Page.c"
 			GtkToolbar* _tmp3_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = (GtkToolbar*) gtk_toolbar_new ();
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			g_object_ref_sink (_tmp3_);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp3_;
 #line 3136 "Page.c"
 		} else {
@@ -3138,56 +3138,56 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 			const gchar* _tmp5_ = NULL;
 			GObject* _tmp6_ = NULL;
 			GtkToolbar* _tmp7_ = NULL;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->builder;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = self->priv->toolbar_path;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = gtk_builder_get_object (_tmp4_, _tmp5_);
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#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 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp7_;
 #line 3154 "Page.c"
 		}
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp1_);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = _tmp8_;
-#line 261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->toolbar;
-#line 261 "/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 261 "/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 262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 260 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->toolbar;
-#line 262 "/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 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
 #line 3174 "Page.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->toolbar;
-#line 264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp13_;
-#line 264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 3184 "Page.c"
 }
 
 
 GtkToolbar* page_get_toolbar (Page* self) {
-#line 256 "/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 256 "/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 3193 "Page.c"
 }
@@ -3195,66 +3195,124 @@ GtkToolbar* page_get_toolbar (Page* self) {
 
 static GtkMenu* page_real_get_page_context_menu (Page* self) {
 	GtkMenu* result = NULL;
-#line 268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 266 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 266 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
 #line 3203 "Page.c"
 }
 
 
 GtkMenu* page_get_page_context_menu (Page* self) {
-#line 267 "/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 267 "/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 3212 "Page.c"
 }
 
 
 static void page_real_switching_from (Page* self) {
-	const gchar* _tmp0_ = NULL;
-#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+#line 270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = _tmp0_;
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (_tmp1_);
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = self->priv->toolbar_path;
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->priv->toolbar_path;
-#line 273 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp0_ != NULL) {
-#line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 273 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 3228 "Page.c"
+#line 3238 "Page.c"
 	}
 }
 
 
 void page_switching_from (Page* self) {
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_from (self);
-#line 3238 "Page.c"
+#line 3248 "Page.c"
 }
 
 
 static void page_real_switched_to (Page* self) {
-#line 278 "/home/jens/Source/shotwell/src/Page.vala"
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	gint selected_count = 0;
+	ViewCollection* _tmp2_ = NULL;
+	ViewCollection* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	gint count = 0;
+	ViewCollection* _tmp6_ = NULL;
+	ViewCollection* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 278 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_ui (self);
+#line 279 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 279 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = _tmp0_;
+#line 279 "/home/jens/Source/shotwell/src/Page.vala"
+	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
+#line 279 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (_tmp1_);
 #line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = page_get_view (self);
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = _tmp2_;
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = view_collection_get_selected_count (_tmp3_);
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = _tmp4_;
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp3_);
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	selected_count = _tmp5_;
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp6_ = page_get_view (self);
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp7_ = _tmp6_;
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp9_ = _tmp8_;
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp7_);
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+	count = _tmp9_;
+#line 282 "/home/jens/Source/shotwell/src/Page.vala"
+	page_init_actions (self, selected_count, count);
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	page_update_actions (self, selected_count, count);
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 3249 "Page.c"
+#line 3307 "Page.c"
 }
 
 
 void page_switched_to (Page* self) {
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 3258 "Page.c"
+#line 3316 "Page.c"
 }
 
 
@@ -3263,106 +3321,151 @@ static void page_real_ready (Page* self) {
 
 
 void page_ready (Page* self) {
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 3271 "Page.c"
+#line 3329 "Page.c"
 }
 
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->in_view;
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3286 "Page.c"
+#line 3344 "Page.c"
 }
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+	FullscreenWindow* _tmp0_ = NULL;
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 3293 "Page.c"
+#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = fsw;
+#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
+#line 3356 "Page.c"
 }
 
 
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 3302 "Page.c"
+#line 3365 "Page.c"
 }
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 293 "/home/jens/Source/shotwell/src/Page.vala"
+	FullscreenWindow* _tmp0_ = NULL;
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 3309 "Page.c"
+#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = fsw;
+#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
+	page_switched_to (self);
+#line 3379 "Page.c"
 }
 
 
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 3318 "Page.c"
+#line 3388 "Page.c"
 }
 
 
 GAction* page_get_action (Page* self, const gchar* name) {
 	GAction* result = NULL;
-	AppWindow* aw = NULL;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/Page.vala"
+	GActionMap* map = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GActionMap* _tmp5_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 303 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 297 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 297 "/home/jens/Source/shotwell/src/Page.vala"
-	aw = _tmp0_;
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = aw;
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp1_ != NULL) {
-#line 3339 "Page.c"
-		AppWindow* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		GAction* _tmp4_ = NULL;
-		GAction* _tmp5_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp2_ = aw;
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = name;
-#line 300 "/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 300 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-		result = _tmp5_;
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (aw);
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+	map = NULL;
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = self->priv->container;
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) {
+#line 3407 "Page.c"
+		GtkWindow* _tmp1_ = NULL;
+		GActionMap* _tmp2_ = NULL;
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp1_ = self->priv->container;
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_action_map_get_type ()) ? ((GActionMap*) _tmp1_) : NULL);
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (map);
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+		map = _tmp2_;
+#line 3418 "Page.c"
+	} else {
+		AppWindow* _tmp3_ = NULL;
+		GActionMap* _tmp4_ = NULL;
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = app_window_get_instance ();
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_action_map_get_type ()) ? ((GActionMap*) _tmp3_) : NULL;
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+		if (_tmp4_ == NULL) {
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+			_g_object_unref0 (_tmp3_);
+#line 3430 "Page.c"
+		}
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (map);
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+		map = _tmp4_;
+#line 3436 "Page.c"
+	}
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = map;
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp5_ != NULL) {
+#line 3442 "Page.c"
+		GActionMap* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		GAction* _tmp8_ = NULL;
+		GAction* _tmp9_ = NULL;
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = map;
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = name;
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = g_action_map_lookup_action (_tmp6_, _tmp7_);
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp9_ = _g_object_ref0 (_tmp8_);
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		result = _tmp9_;
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (map);
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3358 "Page.c"
+#line 3461 "Page.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (aw);
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (map);
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3366 "Page.c"
+#line 3469 "Page.c"
 }
 
 
@@ -3372,92 +3475,92 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3390 "Page.c"
+#line 3493 "Page.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 320 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3398 "Page.c"
+#line 3501 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 321 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 321 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 321 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3407 "Page.c"
+#line 3510 "Page.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3411 "Page.c"
+#line 3514 "Page.c"
 }
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = important;
-#line 313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3428 "Page.c"
+#line 3531 "Page.c"
 }
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = visible;
-#line 317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3445 "Page.c"
+#line 3548 "Page.c"
 }
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
 	const gchar* _tmp0_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (short_label != NULL);
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:321: => Set action short_label called for %s", _tmp0_);
-#line 3461 "Page.c"
+#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:333: => Set action short_label called for %s", _tmp0_);
+#line 3564 "Page.c"
 }
 
 
@@ -3470,58 +3573,58 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 	const gchar* _tmp4_ = NULL;
 	GSimpleAction* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3488 "Page.c"
+#line 3591 "Page.c"
 	}
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3500 "Page.c"
+#line 3603 "Page.c"
 	}
-#line 330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = label;
-#line 330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 342 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 3506 "Page.c"
+#line 3609 "Page.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = label;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 		page_update_menu_item_label (self, _tmp5_, _tmp6_);
-#line 3515 "Page.c"
+#line 3618 "Page.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = action;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = sensitive;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 345 "/home/jens/Source/shotwell/src/Page.vala"
 	g_simple_action_set_enabled (_tmp7_, _tmp8_);
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3525 "Page.c"
+#line 3628 "Page.c"
 }
 
 
@@ -3530,31 +3633,31 @@ void page_activate_action (Page* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 351 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3548 "Page.c"
+#line 3651 "Page.c"
 		GAction* _tmp3_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 		g_action_activate (_tmp3_, NULL);
-#line 3554 "Page.c"
+#line 3657 "Page.c"
 	}
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3558 "Page.c"
+#line 3661 "Page.c"
 }
 
 
@@ -3565,53 +3668,53 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		result = action;
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3587 "Page.c"
+#line 3690 "Page.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 361 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = log_warning;
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 361 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 3593 "Page.c"
+#line 3696 "Page.c"
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = name;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:350: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:362: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp5_);
-#line 3607 "Page.c"
+#line 3710 "Page.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3615 "Page.c"
+#line 3718 "Page.c"
 }
 
 
@@ -3621,72 +3724,72 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 356 "/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 356 "/home/jens/Source/shotwell/src/Page.vala"
+#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 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3639 "Page.c"
+#line 3742 "Page.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3647 "Page.c"
+#line 3750 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3656 "Page.c"
+#line 3759 "Page.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3660 "Page.c"
+#line 3763 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
 	const gchar* _tmp0_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:362: Trying to set common action label for %s", _tmp0_);
-#line 3676 "Page.c"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:374: Trying to set common action label for %s", _tmp0_);
+#line 3779 "Page.c"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 366 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:366: Setting action to important: %s", _tmp0_);
-#line 3690 "Page.c"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:378: Setting action to important: %s", _tmp0_);
+#line 3793 "Page.c"
 }
 
 
@@ -3696,106 +3799,106 @@ void page_activate_common_action (Page* self, const gchar* name) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3714 "Page.c"
+#line 3817 "Page.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3722 "Page.c"
+#line 3825 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_emit_by_name (_tmp4_, "activate", NULL);
-#line 3728 "Page.c"
+#line 3831 "Page.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3732 "Page.c"
+#line 3835 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 387 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3747 "Page.c"
+#line 3850 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3762 "Page.c"
+#line 3865 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 396 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 396 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 396 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3777 "Page.c"
+#line 3880 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3792 "Page.c"
+#line 3895 "Page.c"
 }
 
 
 static GVariant* _variant_new20 (gboolean value) {
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3799 "Page.c"
+#line 3902 "Page.c"
 }
 
 
@@ -3805,47 +3908,47 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3823 "Page.c"
+#line 3926 "Page.c"
 	}
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 404 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3831 "Page.c"
+#line 3934 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		GVariant* _tmp6_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = active;
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _variant_new20 (_tmp5_);
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_state (_tmp4_, _tmp6_);
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 3845 "Page.c"
+#line 3948 "Page.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3849 "Page.c"
+#line 3952 "Page.c"
 }
 
 
@@ -3875,125 +3978,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_ = 0;
 	GdkModifierType _tmp15_ = 0;
 	GdkModifierType _tmp16_ = 0;
-#line 398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 414 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 415 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_super = FALSE;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 3907 "Page.c"
+#line 4010 "Page.c"
 		}
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 3913 "Page.c"
+#line 4016 "Page.c"
 		}
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 3919 "Page.c"
+#line 4022 "Page.c"
 		}
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 3925 "Page.c"
+#line 4028 "Page.c"
 		}
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3929 "Page.c"
+#line 4032 "Page.c"
 	}
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 426 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 426 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 428 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 428 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 3975 "Page.c"
+#line 4078 "Page.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 3981 "Page.c"
+#line 4084 "Page.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 3987 "Page.c"
+#line 4090 "Page.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 3993 "Page.c"
+#line 4096 "Page.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3997 "Page.c"
+#line 4100 "Page.c"
 }
 
 
@@ -4019,229 +4122,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp4_) {
-#line 426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4039 "Page.c"
+#line 4142 "Page.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 4045 "Page.c"
+#line 4148 "Page.c"
 		gboolean _tmp7_ = FALSE;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 4051 "Page.c"
+#line 4154 "Page.c"
 	} else {
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 4055 "Page.c"
+#line 4158 "Page.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 4061 "Page.c"
+#line 4164 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 4069 "Page.c"
+#line 4172 "Page.c"
 			gboolean _tmp10_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 4075 "Page.c"
+#line 4178 "Page.c"
 		} else {
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 4079 "Page.c"
+#line 4182 "Page.c"
 		}
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 4085 "Page.c"
+#line 4188 "Page.c"
 		}
 	}
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 4092 "Page.c"
+#line 4195 "Page.c"
 		gboolean _tmp13_ = FALSE;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 4098 "Page.c"
+#line 4201 "Page.c"
 	} else {
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 4102 "Page.c"
+#line 4205 "Page.c"
 	}
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 447 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 4108 "Page.c"
+#line 4211 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 4116 "Page.c"
+#line 4219 "Page.c"
 			gboolean _tmp16_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 4122 "Page.c"
+#line 4225 "Page.c"
 		} else {
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 4126 "Page.c"
+#line 4229 "Page.c"
 		}
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 4132 "Page.c"
+#line 4235 "Page.c"
 		}
 	}
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 4139 "Page.c"
+#line 4242 "Page.c"
 		gboolean _tmp19_ = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 4145 "Page.c"
+#line 4248 "Page.c"
 	} else {
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 4149 "Page.c"
+#line 4252 "Page.c"
 	}
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 452 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 4155 "Page.c"
+#line 4258 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 4163 "Page.c"
+#line 4266 "Page.c"
 			gboolean _tmp22_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 4169 "Page.c"
+#line 4272 "Page.c"
 		} else {
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 4173 "Page.c"
+#line 4276 "Page.c"
 		}
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 4179 "Page.c"
+#line 4282 "Page.c"
 		}
 	}
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 4186 "Page.c"
+#line 4289 "Page.c"
 		gboolean _tmp25_ = FALSE;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 4192 "Page.c"
+#line 4295 "Page.c"
 	} else {
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4196 "Page.c"
+#line 4299 "Page.c"
 	}
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4202 "Page.c"
+#line 4305 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4210 "Page.c"
+#line 4313 "Page.c"
 			gboolean _tmp28_ = FALSE;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4216 "Page.c"
+#line 4319 "Page.c"
 		} else {
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4220 "Page.c"
+#line 4323 "Page.c"
 		}
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4226 "Page.c"
+#line 4329 "Page.c"
 		}
 	}
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4245 "Page.c"
+#line 4348 "Page.c"
 }
 
 
@@ -4251,115 +4354,134 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_ = NULL;
 	GtkContainer* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 467 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4267 "Page.c"
+#line 4370 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 		GtkContainer* _tmp8_ = NULL;
 		GtkContainer* _tmp9_ = NULL;
 		GtkWidget* _tmp10_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4280 "Page.c"
+#line 4383 "Page.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4286 "Page.c"
+#line 4389 "Page.c"
 			GtkWidget* _tmp5_ = NULL;
 			PageWindow* _tmp6_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4299 "Page.c"
+#line 4402 "Page.c"
 		}
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4313 "Page.c"
+#line 4416 "Page.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4321 "Page.c"
+#line 4424 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
-#line 467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4336 "Page.c"
+#line 4439 "Page.c"
 }
 
 
-static void page_real_add_actions (Page* self) {
+static void page_real_add_actions (Page* self, GActionMap* map) {
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 4446 "Page.c"
 }
 
 
-void page_add_actions (Page* self) {
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+void page_add_actions (Page* self, GActionMap* map) {
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
-	PAGE_GET_CLASS (self)->add_actions (self);
-#line 4349 "Page.c"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+	PAGE_GET_CLASS (self)->add_actions (self, map);
+#line 4455 "Page.c"
+}
+
+
+static void page_real_remove_actions (Page* self, GActionMap* map) {
+#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 4462 "Page.c"
+}
+
+
+void page_remove_actions (Page* self, GActionMap* map) {
+#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+	PAGE_GET_CLASS (self)->remove_actions (self, map);
+#line 4471 "Page.c"
 }
 
 
 static gboolean _variant_get21 (GVariant* value) {
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_get_boolean (value);
-#line 4356 "Page.c"
+#line 4478 "Page.c"
 }
 
 
 static GVariant* _variant_new22 (gboolean value) {
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4363 "Page.c"
+#line 4485 "Page.c"
 }
 
 
@@ -4372,59 +4494,50 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
 	GAction* _tmp6_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _variant_get21 (_tmp2_);
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _variant_new22 (!_tmp3_);
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	new_state = _tmp5_;
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = action;
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (new_state);
-#line 4402 "Page.c"
+#line 4524 "Page.c"
 }
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_ = NULL;
 	GVariant* _tmp1_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = value;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4419 "Page.c"
-}
-
-
-static void page_init_ui (Page* self) {
-#line 482 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-	page_add_actions (self);
-#line 4428 "Page.c"
+#line 4541 "Page.c"
 }
 
 
@@ -4435,36 +4548,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4457 "Page.c"
+#line 4570 "Page.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:491: No UI file specified for %s", _tmp6_);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+		g_message ("Page.vala:500: No UI file specified for %s", _tmp6_);
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 4468 "Page.c"
+#line 4581 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4475,25 +4588,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _ui_filename_index = 0;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4497 "Page.c"
+#line 4610 "Page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -4502,90 +4615,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_ = 0;
 			gpointer _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4518 "Page.c"
+#line 4631 "Page.c"
 			}
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4534 "Page.c"
+#line 4647 "Page.c"
 		}
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4538 "Page.c"
+#line 4651 "Page.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4542 "Page.c"
+#line 4655 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4561 "Page.c"
+#line 4674 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4568 "Page.c"
+#line 4681 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4575 "Page.c"
+#line 4688 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4582 "Page.c"
+#line 4695 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4589 "Page.c"
+#line 4702 "Page.c"
 }
 
 
@@ -4613,87 +4726,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_ = NULL;
 	ViewCollection* _tmp19_ = NULL;
 	ViewCollection* _tmp20_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4625 "Page.c"
+#line 4738 "Page.c"
 	}
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/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 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/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 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/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 517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/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 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4697 "Page.c"
+#line 4810 "Page.c"
 }
 
 
@@ -4711,149 +4824,158 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_ = NULL;
 	ViewCollection* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4723 "Page.c"
+#line 4836 "Page.c"
 	}
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/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 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/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 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 539 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 539 "/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 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 539 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/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 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4767 "Page.c"
+#line 4880 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4774 "Page.c"
+#line 4887 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp6_ = NULL;
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4787 "Page.c"
+#line 4900 "Page.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		OneShotScheduler* _tmp5_ = NULL;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4811 "Page.c"
+#line 4924 "Page.c"
 	}
-#line 543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4817 "Page.c"
+#line 4930 "Page.c"
 }
 
 
 static void page_on_update_actions_on_idle (Page* self) {
 	gboolean _tmp0_ = FALSE;
-	ViewCollection* _tmp1_ = NULL;
+	gboolean _tmp1_ = FALSE;
 	ViewCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	ViewCollection* _tmp4_ = NULL;
+	ViewCollection* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
 	ViewCollection* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4837 "Page.c"
+#line 4951 "Page.c"
 	}
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_view (self);
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = _tmp1_;
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = page_get_view (self);
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp5_ = _tmp4_;
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	page_update_actions (self, _tmp3_, _tmp6_);
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp5_);
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp2_);
-#line 4857 "Page.c"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = self->in_view;
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+	if (!_tmp1_) {
+#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+		return;
+#line 4959 "Page.c"
+	}
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = page_get_view (self);
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = _tmp2_;
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = view_collection_get_selected_count (_tmp3_);
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = page_get_view (self);
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp6_ = _tmp5_;
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	page_update_actions (self, _tmp4_, _tmp7_);
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp6_);
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp3_);
+#line 4979 "Page.c"
 }
 
 
@@ -4862,39 +4984,39 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	const gchar* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 565 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 565 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_file = _tmp1_;
-#line 4876 "Page.c"
+#line 4998 "Page.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_file_get_path (ui_file);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_builder_add_from_file (_tmp2_, _tmp4_, &_inner_error_);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4893 "Page.c"
-			goto __catch251_g_error;
+#line 5015 "Page.c"
+			goto __catch253_g_error;
 		}
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally253;
+	__catch253_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp5_ = NULL;
@@ -4905,72 +5027,72 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		gchar* _tmp10_ = NULL;
 		Application* _tmp11_ = NULL;
 		Application* _tmp12_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = g_file_get_path (ui_file);
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = err;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->message;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp6_, _tmp8_);
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp10_);
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = application_get_instance ();
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _tmp11_;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 		application_panic (_tmp12_);
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 		_application_unref0 (_tmp12_);
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 4941 "Page.c"
+#line 5063 "Page.c"
 	}
-	__finally251:
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally253:
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (ui_file);
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/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 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4954 "Page.c"
+#line 5076 "Page.c"
 	}
-#line 553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 565 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_file);
-#line 4958 "Page.c"
+#line 5080 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 580 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 4965 "Page.c"
+#line 5087 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 580 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 580 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 4974 "Page.c"
+#line 5096 "Page.c"
 }
 
 
@@ -4979,32 +5101,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_ = NULL;
 	InjectionGroup** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 4993 "Page.c"
+#line 5115 "Page.c"
 	}
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4999 "Page.c"
+#line 5121 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 585 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 585 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 5008 "Page.c"
+#line 5130 "Page.c"
 }
 
 
@@ -5013,11 +5135,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 579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5021 "Page.c"
+#line 5143 "Page.c"
 }
 
 
@@ -5026,48 +5148,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 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5034 "Page.c"
+#line 5156 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5041 "Page.c"
+#line 5163 "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 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5048 "Page.c"
+#line 5170 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5055 "Page.c"
+#line 5177 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5062 "Page.c"
+#line 5184 "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 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5071 "Page.c"
+#line 5193 "Page.c"
 }
 
 
@@ -5083,53 +5205,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 604 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5095 "Page.c"
+#line 5217 "Page.c"
 	}
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 606 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 606 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/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 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/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 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/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 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/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 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/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 606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5133 "Page.c"
+#line 5255 "Page.c"
 }
 
 
@@ -5147,86 +5269,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkWidget* _tmp12_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 623 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5159 "Page.c"
+#line 5281 "Page.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/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 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/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 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/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 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 630 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 630 "/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 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/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 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 632 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_unset (_tmp12_);
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5201 "Page.c"
+#line 5323 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5216 "Page.c"
+#line 5338 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 641 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 641 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/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 5230 "Page.c"
+#line 5352 "Page.c"
 }
 
 
@@ -5235,72 +5357,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/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 5255 "Page.c"
+#line 5377 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/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 5269 "Page.c"
+#line 5391 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/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 5283 "Page.c"
+#line 5405 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 663 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 663 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5295 "Page.c"
+#line 5417 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5304 "Page.c"
+#line 5426 "Page.c"
 }
 
 
@@ -5309,21 +5431,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_ = NULL;
 	GtkDragResult _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 667 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 667 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 667 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 667 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 667 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5327 "Page.c"
+#line 5449 "Page.c"
 }
 
 
@@ -5352,291 +5474,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 664 "/home/jens/Source/shotwell/src/Page.vala"
+#line 676 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 677 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_mask = 0;
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5374 "Page.c"
+#line 5496 "Page.c"
 		}
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5380 "Page.c"
+#line 5502 "Page.c"
 		}
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5386 "Page.c"
+#line 5508 "Page.c"
 		}
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5390 "Page.c"
+#line 5512 "Page.c"
 	}
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5418 "Page.c"
+#line 5540 "Page.c"
 	} else {
 		GdkPoint _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5428 "Page.c"
+#line 5550 "Page.c"
 	}
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5438 "Page.c"
+#line 5560 "Page.c"
 		}
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5444 "Page.c"
+#line 5566 "Page.c"
 		}
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5450 "Page.c"
+#line 5572 "Page.c"
 		}
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5454 "Page.c"
+#line 5576 "Page.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5466 "Page.c"
+#line 5588 "Page.c"
 		gint _tmp18_ = 0;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5472 "Page.c"
+#line 5594 "Page.c"
 	}
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5484 "Page.c"
+#line 5606 "Page.c"
 		gint _tmp23_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5490 "Page.c"
+#line 5612 "Page.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5498 "Page.c"
+#line 5620 "Page.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5504 "Page.c"
+#line 5626 "Page.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5510 "Page.c"
+#line 5632 "Page.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5514 "Page.c"
+#line 5636 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5526 "Page.c"
+#line 5648 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5535 "Page.c"
+#line 5657 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 695 "/home/jens/Source/shotwell/src/Page.vala"
+#line 707 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/Page.vala"
+#line 707 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5547 "Page.c"
+#line 5669 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5556 "Page.c"
+#line 5678 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 711 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 711 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5568 "Page.c"
+#line 5690 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5577 "Page.c"
+#line 5699 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5589 "Page.c"
+#line 5711 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5598 "Page.c"
+#line 5720 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 719 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 719 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5610 "Page.c"
+#line 5732 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5619 "Page.c"
+#line 5741 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 723 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 723 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5631 "Page.c"
+#line 5753 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5640 "Page.c"
+#line 5762 "Page.c"
 }
 
 
@@ -5644,19 +5766,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 726 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 726 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5660 "Page.c"
+#line 5782 "Page.c"
 		{
 			GtkWidget* _tmp2_ = NULL;
 			GdkEventButton* _tmp4_ = NULL;
@@ -5665,79 +5787,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_ = 0.0;
 			GdkEventButton* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5673 "Page.c"
+#line 5795 "Page.c"
 				GtkWidget* _tmp3_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5679 "Page.c"
+#line 5801 "Page.c"
 			}
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.y = (gint) _tmp7_;
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5701 "Page.c"
+#line 5823 "Page.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5705 "Page.c"
+#line 5827 "Page.c"
 		{
 			GdkEventButton* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5717 "Page.c"
+#line 5839 "Page.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5721 "Page.c"
+#line 5843 "Page.c"
 		{
 			GdkEventButton* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5733 "Page.c"
+#line 5855 "Page.c"
 		}
 		default:
 		{
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5741 "Page.c"
+#line 5863 "Page.c"
 		}
 	}
 }
@@ -5747,78 +5869,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5763 "Page.c"
+#line 5885 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down = _tmp2_;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5782 "Page.c"
+#line 5904 "Page.c"
 		}
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5786 "Page.c"
+#line 5908 "Page.c"
 		{
 			GdkEventButton* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5798 "Page.c"
+#line 5920 "Page.c"
 		}
-#line 738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5802 "Page.c"
+#line 5924 "Page.c"
 		{
 			GdkEventButton* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5814 "Page.c"
+#line 5936 "Page.c"
 		}
 		default:
 		{
-#line 752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5822 "Page.c"
+#line 5944 "Page.c"
 		}
 	}
 }
@@ -5826,195 +5948,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 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 769 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 769 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5834 "Page.c"
+#line 5956 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 5843 "Page.c"
+#line 5965 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 773 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 773 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5853 "Page.c"
+#line 5975 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 5862 "Page.c"
+#line 5984 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 777 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 777 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5872 "Page.c"
+#line 5994 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 5881 "Page.c"
+#line 6003 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 781 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 781 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5891 "Page.c"
+#line 6013 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 5900 "Page.c"
+#line 6022 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 785 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 785 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5910 "Page.c"
+#line 6032 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 5919 "Page.c"
+#line 6041 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 789 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 789 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5929 "Page.c"
+#line 6051 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 5938 "Page.c"
+#line 6060 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 793 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 793 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5948 "Page.c"
+#line 6070 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 5957 "Page.c"
+#line 6079 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5967 "Page.c"
+#line 6089 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 5976 "Page.c"
+#line 6098 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 801 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 801 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5988 "Page.c"
+#line 6110 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 5997 "Page.c"
+#line 6119 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 804 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6009 "Page.c"
+#line 6131 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 804 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 804 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6018 "Page.c"
+#line 6140 "Page.c"
 }
 
 
@@ -6033,248 +6155,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6057 "Page.c"
+#line 6179 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/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 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6088 "Page.c"
+#line 6210 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6101 "Page.c"
+#line 6223 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6108 "Page.c"
+#line 6230 "Page.c"
 				}
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 818 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 818 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6116 "Page.c"
+#line 6238 "Page.c"
 				}
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = TRUE;
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 822 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 822 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 822 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 822 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6128 "Page.c"
+#line 6250 "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 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6134 "Page.c"
+#line 6256 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6147 "Page.c"
+#line 6269 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6154 "Page.c"
+#line 6276 "Page.c"
 				}
-#line 816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 829 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 829 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6162 "Page.c"
+#line 6284 "Page.c"
 				}
-#line 819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 831 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = TRUE;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6174 "Page.c"
+#line 6296 "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 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6180 "Page.c"
+#line 6302 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6193 "Page.c"
+#line 6315 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6200 "Page.c"
+#line 6322 "Page.c"
 				}
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 838 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 838 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6208 "Page.c"
+#line 6330 "Page.c"
 				}
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 840 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = TRUE;
-#line 830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6220 "Page.c"
+#line 6342 "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 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6226 "Page.c"
+#line 6348 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6239 "Page.c"
+#line 6361 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6246 "Page.c"
+#line 6368 "Page.c"
 				}
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 847 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 847 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6254 "Page.c"
+#line 6376 "Page.c"
 				}
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = TRUE;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6266 "Page.c"
+#line 6388 "Page.c"
 			}
 		}
 	}
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6278 "Page.c"
+#line 6400 "Page.c"
 }
 
 
@@ -6293,406 +6415,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6317 "Page.c"
+#line 6439 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/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 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6348 "Page.c"
+#line 6470 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6361 "Page.c"
+#line 6483 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6368 "Page.c"
+#line 6490 "Page.c"
 				}
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 867 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 867 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6376 "Page.c"
+#line 6498 "Page.c"
 				}
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = FALSE;
-#line 859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 871 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 871 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 871 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 871 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6388 "Page.c"
+#line 6510 "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 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6394 "Page.c"
+#line 6516 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6407 "Page.c"
+#line 6529 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6414 "Page.c"
+#line 6536 "Page.c"
 				}
-#line 865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 878 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 878 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6422 "Page.c"
+#line 6544 "Page.c"
 				}
-#line 868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 880 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = FALSE;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6434 "Page.c"
+#line 6556 "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 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6440 "Page.c"
+#line 6562 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6453 "Page.c"
+#line 6575 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6460 "Page.c"
+#line 6582 "Page.c"
 				}
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 887 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 887 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6468 "Page.c"
+#line 6590 "Page.c"
 				}
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 889 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6480 "Page.c"
+#line 6602 "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 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6486 "Page.c"
+#line 6608 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6499 "Page.c"
+#line 6621 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6506 "Page.c"
+#line 6628 "Page.c"
 				}
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 896 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 896 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6514 "Page.c"
+#line 6636 "Page.c"
 				}
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = FALSE;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6526 "Page.c"
+#line 6648 "Page.c"
 			}
 		}
 	}
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 903 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 903 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 903 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 903 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6538 "Page.c"
+#line 6660 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6554 "Page.c"
+#line 6676 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6568 "Page.c"
+#line 6690 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6575 "Page.c"
+#line 6697 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6584 "Page.c"
+#line 6706 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6591 "Page.c"
+#line 6713 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6600 "Page.c"
+#line 6722 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6607 "Page.c"
+#line 6729 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6616 "Page.c"
+#line 6738 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6623 "Page.c"
+#line 6745 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6632 "Page.c"
+#line 6754 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6639 "Page.c"
+#line 6761 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6648 "Page.c"
+#line 6770 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6655 "Page.c"
+#line 6777 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6664 "Page.c"
+#line 6786 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6678 "Page.c"
+#line 6800 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6687 "Page.c"
+#line 6809 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6696 "Page.c"
+#line 6818 "Page.c"
 }
 
 
@@ -6723,41 +6845,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_ = NULL;
 	GdkRectangle _tmp52_ = {0};
 	gboolean _tmp53_ = FALSE;
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 939 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 943 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 6761 "Page.c"
+#line 6883 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_ = {0};
 		gint _tmp11_ = 0;
@@ -6768,193 +6890,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_ = 0;
 		GdkRectangle _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 6784 "Page.c"
+#line 6906 "Page.c"
 		} else {
 			GdkRectangle _tmp14_ = {0};
 			gint _tmp15_ = 0;
 			GdkRectangle _tmp16_ = {0};
 			gint _tmp17_ = 0;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 6800 "Page.c"
+#line 6922 "Page.c"
 		}
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 6804 "Page.c"
+#line 6926 "Page.c"
 			GdkRectangle _tmp18_ = {0};
-#line 936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 6812 "Page.c"
+#line 6934 "Page.c"
 		}
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 6826 "Page.c"
+#line 6948 "Page.c"
 		} else {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			GdkRectangle _tmp26_ = {0};
 			gint _tmp27_ = 0;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 6842 "Page.c"
+#line 6964 "Page.c"
 		}
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 6846 "Page.c"
+#line 6968 "Page.c"
 			GdkRectangle _tmp28_ = {0};
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 6854 "Page.c"
+#line 6976 "Page.c"
 		}
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/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 6858 "Page.c"
+#line 6980 "Page.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 6872 "Page.c"
+#line 6994 "Page.c"
 	} else {
 		GdkRectangle _tmp34_ = {0};
 		gint _tmp35_ = 0;
 		GdkRectangle _tmp36_ = {0};
 		gint _tmp37_ = 0;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 6888 "Page.c"
+#line 7010 "Page.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 6892 "Page.c"
+#line 7014 "Page.c"
 		GdkRectangle _tmp38_ = {0};
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 6898 "Page.c"
+#line 7020 "Page.c"
 	}
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 6912 "Page.c"
+#line 7034 "Page.c"
 	} else {
 		GdkRectangle _tmp44_ = {0};
 		gint _tmp45_ = 0;
 		GdkRectangle _tmp46_ = {0};
 		gint _tmp47_ = 0;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 6928 "Page.c"
+#line 7050 "Page.c"
 	}
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 6932 "Page.c"
+#line 7054 "Page.c"
 		GdkRectangle _tmp48_ = {0};
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 6938 "Page.c"
+#line 7060 "Page.c"
 	}
-#line 956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = _tmp50_;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6958 "Page.c"
+#line 7080 "Page.c"
 }
 
 
@@ -6967,117 +7089,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 6981 "Page.c"
+#line 7103 "Page.c"
 	}
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 978 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 978 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 978 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 979 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 979 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 6993 "Page.c"
+#line 7115 "Page.c"
 	}
-#line 970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp3_;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 7003 "Page.c"
+#line 7125 "Page.c"
 		GtkAllocation _tmp5_ = {0};
 		GdkRectangle _tmp6_ = {0};
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 7012 "Page.c"
+#line 7134 "Page.c"
 	}
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 987 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 987 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7018 "Page.c"
+#line 7140 "Page.c"
 		GtkAllocation _tmp8_ = {0};
 		GdkRectangle _tmp9_ = {0};
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7027 "Page.c"
+#line 7149 "Page.c"
 	}
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7039 "Page.c"
+#line 7161 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7053 "Page.c"
+#line 7175 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7062 "Page.c"
+#line 7184 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7072 "Page.c"
+#line 7194 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7081 "Page.c"
+#line 7203 "Page.c"
 }
 
 
@@ -7093,29 +7215,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_ = 0;
 	GdkModifierType _tmp14_ = 0;
 	gboolean _tmp15_ = FALSE;
-#line 995 "/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 995 "/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 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7107 "Page.c"
+#line 7229 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7119 "Page.c"
+#line 7241 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
@@ -7123,41 +7245,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_ = 0.0;
 		GdkEventMotion* _tmp9_ = NULL;
 		GdkModifierType _tmp10_ = 0;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7145 "Page.c"
+#line 7267 "Page.c"
 	}
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7161 "Page.c"
+#line 7283 "Page.c"
 }
 
 
@@ -7165,87 +7287,87 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkScrollDirection _tmp1_ = 0;
-#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/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 1021 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7181 "Page.c"
+#line 7303 "Page.c"
 		{
 			GdkEventScroll* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7193 "Page.c"
+#line 7315 "Page.c"
 		}
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7197 "Page.c"
+#line 7319 "Page.c"
 		{
 			GdkEventScroll* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7209 "Page.c"
+#line 7331 "Page.c"
 		}
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7213 "Page.c"
+#line 7335 "Page.c"
 		{
 			GdkEventScroll* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7225 "Page.c"
+#line 7347 "Page.c"
 		}
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7229 "Page.c"
+#line 7351 "Page.c"
 		{
 			GdkEventScroll* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7241 "Page.c"
+#line 7363 "Page.c"
 		}
 		default:
 		{
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7249 "Page.c"
+#line 7371 "Page.c"
 		}
 	}
 }
@@ -7253,144 +7375,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 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7263 "Page.c"
+#line 7385 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7272 "Page.c"
+#line 7394 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7284 "Page.c"
+#line 7406 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7293 "Page.c"
+#line 7415 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7305 "Page.c"
+#line 7427 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7314 "Page.c"
+#line 7436 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7326 "Page.c"
+#line 7448 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7335 "Page.c"
+#line 7457 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7345 "Page.c"
+#line 7467 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7354 "Page.c"
+#line 7476 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7366 "Page.c"
+#line 7488 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7375 "Page.c"
+#line 7497 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7385 "Page.c"
+#line 7507 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7394 "Page.c"
+#line 7516 "Page.c"
 }
 
 
@@ -7399,72 +7521,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp3_ = NULL;
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7413 "Page.c"
+#line 7535 "Page.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7420 "Page.c"
+#line 7542 "Page.c"
 	}
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7428 "Page.c"
+#line 7550 "Page.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7434 "Page.c"
+#line 7556 "Page.c"
 		GtkMenu* _tmp4_ = NULL;
 		guint32 _tmp5_ = 0U;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7443 "Page.c"
+#line 7565 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
 		GdkEventButton* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
 		GdkEventButton* _tmp9_ = NULL;
 		guint32 _tmp10_ = 0U;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7462 "Page.c"
+#line 7584 "Page.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7468 "Page.c"
+#line 7590 "Page.c"
 }
 
 
@@ -7479,166 +7601,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_ = NULL;
 	GdkWindow* _tmp11_ = NULL;
 	GdkWindow* _tmp20_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7499 "Page.c"
+#line 7621 "Page.c"
 		GtkWidget* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
 		GdkCursor* _tmp7_ = NULL;
 		GdkCursorType _tmp8_ = 0;
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7516 "Page.c"
+#line 7638 "Page.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7526 "Page.c"
+#line 7648 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7533 "Page.c"
+#line 7655 "Page.c"
 			GdkWindow* _tmp17_ = NULL;
 			GdkWindow* _tmp18_ = NULL;
 			GdkWindow* _tmp19_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7539 "Page.c"
+#line 7661 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7546 "Page.c"
+#line 7668 "Page.c"
 					GdkWindow* _tmp15_ = NULL;
 					GdkCursor* _tmp16_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7555 "Page.c"
+#line 7677 "Page.c"
 				} else {
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7559 "Page.c"
+#line 7681 "Page.c"
 				}
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7565 "Page.c"
+#line 7687 "Page.c"
 				}
 			}
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7580 "Page.c"
+#line 7702 "Page.c"
 		}
 	}
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7587 "Page.c"
+#line 7709 "Page.c"
 		GdkWindow* _tmp21_ = NULL;
 		GdkCursor* _tmp22_ = NULL;
 		GdkCursorType _tmp23_ = 0;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7599 "Page.c"
+#line 7721 "Page.c"
 	}
-#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7603 "Page.c"
+#line 7725 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_ = 0;
-#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7615 "Page.c"
+#line 7737 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7624 "Page.c"
+#line 7746 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_ = 0U;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7636 "Page.c"
+#line 7758 "Page.c"
 		guint _tmp1_ = 0U;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7642 "Page.c"
+#line 7764 "Page.c"
 	}
 }
 
@@ -7646,41 +7768,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
 	guint _tmp1_ = 0U;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7660 "Page.c"
+#line 7782 "Page.c"
 		guint _tmp2_ = 0U;
-#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7666 "Page.c"
+#line 7788 "Page.c"
 	}
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7670 "Page.c"
+#line 7792 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7684 "Page.c"
+#line 7806 "Page.c"
 }
 
 
@@ -7688,29 +7810,29 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7700 "Page.c"
+#line 7822 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7706 "Page.c"
+#line 7828 "Page.c"
 	} else {
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7710 "Page.c"
+#line 7832 "Page.c"
 	}
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7714 "Page.c"
+#line 7836 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
@@ -7722,103 +7844,103 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 		GdkCursorType _tmp11_ = 0;
 		GdkCursor* _tmp12_ = NULL;
 		GdkCursor* _tmp13_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7754 "Page.c"
+#line 7876 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7764 "Page.c"
+#line 7886 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7773 "Page.c"
+#line 7895 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp2_ = 0;
-#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 7786 "Page.c"
+#line 7908 "Page.c"
 		GdkCursorType _tmp1_ = 0;
-#line 1127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 7794 "Page.c"
+#line 7916 "Page.c"
 	}
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 7800 "Page.c"
+#line 7922 "Page.c"
 		guint _tmp3_ = 0U;
 		gint _tmp5_ = 0;
 		guint _tmp6_ = 0U;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 7808 "Page.c"
+#line 7930 "Page.c"
 			guint _tmp4_ = 0U;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 7814 "Page.c"
+#line 7936 "Page.c"
 		}
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/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 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 7822 "Page.c"
+#line 7944 "Page.c"
 	}
 }
 
@@ -7826,15 +7948,15 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_ = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 7838 "Page.c"
+#line 7960 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_ = NULL;
 		GdkWindow* _tmp2_ = NULL;
@@ -7845,41 +7967,41 @@ static gboolean page_on_hide_cursor (Page* self) {
 		GdkDisplay* _tmp7_ = NULL;
 		GdkCursor* _tmp8_ = NULL;
 		GdkCursor* _tmp9_ = NULL;
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7875 "Page.c"
+#line 7997 "Page.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7883 "Page.c"
+#line 8005 "Page.c"
 }
 
 
@@ -7888,25 +8010,25 @@ void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_
 	AppWindow* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (id != NULL);
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (new_label != NULL);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = id;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = new_label;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 7910 "Page.c"
+#line 8032 "Page.c"
 }
 
 
@@ -7916,33 +8038,33 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 	GMenuModel* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	GMenuModel* section = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 7934 "Page.c"
+#line 8056 "Page.c"
 	{
 		gint i = 0;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 7939 "Page.c"
+#line 8061 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 7946 "Page.c"
+#line 8068 "Page.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				gint _tmp6_ = 0;
@@ -7951,71 +8073,71 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 7957 "Page.c"
+#line 8079 "Page.c"
 					gint _tmp3_ = 0;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 7963 "Page.c"
+#line 8085 "Page.c"
 				}
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 7973 "Page.c"
+#line 8095 "Page.c"
 					GMenuModel* _tmp7_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 7979 "Page.c"
+#line 8101 "Page.c"
 				} else {
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 7983 "Page.c"
+#line 8105 "Page.c"
 				}
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7989 "Page.c"
+#line 8111 "Page.c"
 				}
-#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8005 "Page.c"
+#line 8127 "Page.c"
 					GMenuModel* _tmp12_ = NULL;
 					gint _tmp13_ = 0;
 					GMenuModel* _tmp14_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8019 "Page.c"
+#line 8141 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
 					GMenuModel* _tmp15_ = NULL;
@@ -8025,45 +8147,45 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 					gint sub_items = 0;
 					GMenuModel* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8047 "Page.c"
+#line 8169 "Page.c"
 					}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8055 "Page.c"
+#line 8177 "Page.c"
 					{
 						gint j = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8060 "Page.c"
+#line 8182 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8067 "Page.c"
+#line 8189 "Page.c"
 								gboolean _tmp23_ = FALSE;
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
@@ -8072,91 +8194,91 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 								gint _tmp28_ = 0;
 								GMenuModel* _tmp29_ = NULL;
 								GMenuModel* _tmp30_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8078 "Page.c"
+#line 8200 "Page.c"
 									gint _tmp22_ = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8084 "Page.c"
+#line 8206 "Page.c"
 								}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8094 "Page.c"
+#line 8216 "Page.c"
 									GMenuModel* _tmp26_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8100 "Page.c"
+#line 8222 "Page.c"
 								} else {
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8104 "Page.c"
+#line 8226 "Page.c"
 								}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8110 "Page.c"
+#line 8232 "Page.c"
 								}
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8124 "Page.c"
+#line 8246 "Page.c"
 									GMenuModel* _tmp31_ = NULL;
 									const gchar* _tmp32_ = NULL;
 									GMenuModel* _tmp33_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8138 "Page.c"
+#line 8260 "Page.c"
 								}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8142 "Page.c"
+#line 8264 "Page.c"
 							}
 						}
 					}
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8148 "Page.c"
+#line 8270 "Page.c"
 				}
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8152 "Page.c"
+#line 8274 "Page.c"
 			}
 		}
 	}
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8160 "Page.c"
+#line 8282 "Page.c"
 }
 
 
@@ -8190,6 +8312,8 @@ static void page_class_init (PageClass * klass) {
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->add_actions = page_real_add_actions;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->remove_actions = page_real_remove_actions;
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = page_real_init_collect_ui_filenames;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_injection_groups = page_real_init_collect_injection_groups;
@@ -8267,7 +8391,7 @@ static void page_class_init (PageClass * klass) {
 	((PageClass *) klass)->set_page_cursor = page_real_set_page_cursor;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8271 "Page.c"
+#line 8395 "Page.c"
 }
 
 
@@ -8323,9 +8447,9 @@ static void page_instance_init (Page * self) {
 	self->priv->are_actions_attached = FALSE;
 #line 87 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->update_actions_scheduler = NULL;
-#line 207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->menubar_injected = FALSE;
-#line 8329 "Page.c"
+#line 8453 "Page.c"
 }
 
 
@@ -8351,7 +8475,7 @@ static void page_finalize (GObject* obj) {
 	_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (page_parent_class)->finalize (obj);
-#line 8355 "Page.c"
+#line 8479 "Page.c"
 }
 
 
@@ -8380,30 +8504,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 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8386 "Page.c"
+#line 8510 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8393 "Page.c"
+#line 8517 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8400 "Page.c"
+#line 8524 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8407 "Page.c"
+#line 8531 "Page.c"
 }
 
 
@@ -8432,141 +8556,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
 	ViewCollection* _tmp22_ = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/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 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1245 "/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 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/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 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/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 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/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 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/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 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/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 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/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 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/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 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/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 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/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 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/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 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/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 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8532 "Page.c"
+#line 8656 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8551 "Page.c"
+#line 8675 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8570 "Page.c"
+#line 8694 "Page.c"
 }
 
 
@@ -8577,44 +8701,44 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8595 "Page.c"
+#line 8719 "Page.c"
 		GtkMenu* _tmp5_ = NULL;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8603 "Page.c"
+#line 8727 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8612 "Page.c"
+#line 8736 "Page.c"
 	}
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8618 "Page.c"
+#line 8742 "Page.c"
 }
 
 
@@ -8623,11 +8747,11 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8631 "Page.c"
+#line 8755 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8636,52 +8760,52 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/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 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/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 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8666 "Page.c"
+#line 8790 "Page.c"
 	}
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8676 "Page.c"
+#line 8800 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8685 "Page.c"
+#line 8809 "Page.c"
 }
 
 
@@ -8691,13 +8815,13 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_context_menu;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8701 "Page.c"
+#line 8825 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8706,43 +8830,43 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->page_context_menu_path;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/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 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->page_context_menu = _tmp6_;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page_context_menu;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1301 "/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 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8736 "Page.c"
+#line 8860 "Page.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->page_context_menu;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8746 "Page.c"
+#line 8870 "Page.c"
 }
 
 
@@ -8753,23 +8877,23 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8773 "Page.c"
+#line 8897 "Page.c"
 }
 
 
@@ -8777,24 +8901,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos");
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8789 "Page.c"
+#line 8913 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 8798 "Page.c"
+#line 8922 "Page.c"
 }
 
 
@@ -8802,42 +8926,42 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8814 "Page.c"
+#line 8938 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 8823 "Page.c"
+#line 8947 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 8832 "Page.c"
+#line 8956 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 8841 "Page.c"
+#line 8965 "Page.c"
 }
 
 
@@ -8845,61 +8969,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8859 "Page.c"
+#line 8983 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1328 "/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 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 8868 "Page.c"
+#line 8992 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 8877 "Page.c"
+#line 9001 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8887 "Page.c"
+#line 9011 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 8896 "Page.c"
+#line 9020 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 8903 "Page.c"
+#line 9027 "Page.c"
 }
 
 
@@ -8911,33 +9035,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_ = 0U;
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/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 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/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 8941 "Page.c"
+#line 9065 "Page.c"
 }
 
 
@@ -8950,35 +9074,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 1332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/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 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 8982 "Page.c"
+#line 9106 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -8993,37 +9117,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1353 "/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 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9027 "Page.c"
+#line 9151 "Page.c"
 			GtkAdjustment* _tmp19_ = NULL;
 			CheckerboardItem* _tmp20_ = NULL;
 			GdkRectangle _tmp21_ = {0};
@@ -9032,33 +9156,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			AdjustmentRelation _tmp26_ = 0;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9054 "Page.c"
+#line 9178 "Page.c"
 		} else {
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9058 "Page.c"
+#line 9182 "Page.c"
 		}
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9062 "Page.c"
+#line 9186 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_ = NULL;
 			GdkRectangle _tmp28_ = {0};
@@ -9067,38 +9191,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_ = 0.0;
 			GtkAdjustment* _tmp45_ = NULL;
 			gint _tmp46_ = 0;
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9085 "Page.c"
+#line 9209 "Page.c"
 				CheckerboardItem* _tmp32_ = NULL;
 				GdkRectangle _tmp33_ = {0};
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9102 "Page.c"
+#line 9226 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_ = NULL;
 				GdkRectangle _tmp37_ = {0};
@@ -9109,91 +9233,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_ = NULL;
 				gdouble _tmp43_ = 0.0;
 				gint _tmp44_ = 0;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9135 "Page.c"
+#line 9259 "Page.c"
 			}
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9143 "Page.c"
+#line 9267 "Page.c"
 		}
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9149 "Page.c"
+#line 9273 "Page.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/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 9153 "Page.c"
+#line 9277 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9162 "Page.c"
+#line 9286 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9175 "Page.c"
+#line 9299 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9186 "Page.c"
+#line 9310 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9197 "Page.c"
+#line 9321 "Page.c"
 }
 
 
@@ -9203,87 +9327,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9221 "Page.c"
+#line 9345 "Page.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9235 "Page.c"
+#line 9359 "Page.c"
 	} else {
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9239 "Page.c"
+#line 9363 "Page.c"
 	}
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9243 "Page.c"
+#line 9367 "Page.c"
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9254 "Page.c"
+#line 9378 "Page.c"
 	} else {
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gboolean _tmp13_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9272 "Page.c"
+#line 9396 "Page.c"
 			gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9283 "Page.c"
+#line 9407 "Page.c"
 		} else {
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9287 "Page.c"
+#line 9411 "Page.c"
 		}
 	}
 }
@@ -9293,27 +9417,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9311 "Page.c"
+#line 9435 "Page.c"
 		CheckerboardLayout* _tmp3_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9317 "Page.c"
+#line 9441 "Page.c"
 	}
 }
 
@@ -9321,23 +9445,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 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9335 "Page.c"
+#line 9459 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9341 "Page.c"
+#line 9465 "Page.c"
 	}
 }
 
@@ -9347,21 +9471,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 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/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 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9365 "Page.c"
+#line 9489 "Page.c"
 }
 
 
@@ -9371,43 +9495,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	CheckerboardItem* _tmp3_ = NULL;
-#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9389 "Page.c"
+#line 9513 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9398 "Page.c"
+#line 9522 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9411 "Page.c"
+#line 9535 "Page.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataView* view = NULL;
@@ -9422,73 +9546,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_ = NULL;
 			CheckerboardItem* _tmp12_ = NULL;
 			CheckerboardItem* _tmp13_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9434 "Page.c"
+#line 9558 "Page.c"
 			}
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9458 "Page.c"
+#line 9582 "Page.c"
 			}
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9470 "Page.c"
+#line 9594 "Page.c"
 			}
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9482 "Page.c"
+#line 9606 "Page.c"
 			}
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9488 "Page.c"
+#line 9612 "Page.c"
 		}
-#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9492 "Page.c"
+#line 9616 "Page.c"
 	}
 }
 
@@ -9505,138 +9629,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9539 "Page.c"
+#line 9663 "Page.c"
 	gboolean _tmp45_ = FALSE;
 	gboolean _tmp46_ = FALSE;
-#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9568 "Page.c"
+#line 9692 "Page.c"
 			default:
 			{
 				guint _tmp8_ = 0U;
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9580 "Page.c"
+#line 9704 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9586 "Page.c"
+#line 9710 "Page.c"
 			default:
 			{
 				guint _tmp9_ = 0U;
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9598 "Page.c"
+#line 9722 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9604 "Page.c"
+#line 9728 "Page.c"
 			default:
 			{
 				guint _tmp10_ = 0U;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9616 "Page.c"
+#line 9740 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9622 "Page.c"
+#line 9746 "Page.c"
 			default:
 			{
 				guint _tmp11_ = 0U;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9634 "Page.c"
+#line 9758 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9640 "Page.c"
+#line 9764 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9646,45 +9770,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_ = NULL;
 				CheckerboardItem* _tmp16_ = NULL;
 				guint _tmp18_ = 0U;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9666 "Page.c"
+#line 9790 "Page.c"
 					CheckerboardItem* _tmp17_ = NULL;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9672 "Page.c"
+#line 9796 "Page.c"
 				}
-#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9682 "Page.c"
+#line 9806 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9688 "Page.c"
+#line 9812 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -9694,100 +9818,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_ = NULL;
 				CheckerboardItem* _tmp23_ = NULL;
 				guint _tmp25_ = 0U;
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9714 "Page.c"
+#line 9838 "Page.c"
 					CheckerboardItem* _tmp24_ = NULL;
-#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9720 "Page.c"
+#line 9844 "Page.c"
 				}
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9730 "Page.c"
+#line 9854 "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 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9736 "Page.c"
+#line 9860 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_ = NULL;
 				ViewCollection* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 9755 "Page.c"
+#line 9879 "Page.c"
 					ViewCollection* _tmp30_ = NULL;
 					ViewCollection* _tmp31_ = NULL;
 					DataView* _tmp32_ = NULL;
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 9777 "Page.c"
+#line 9901 "Page.c"
 				} else {
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 9781 "Page.c"
+#line 9905 "Page.c"
 				}
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9785 "Page.c"
+#line 9909 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9791 "Page.c"
+#line 9915 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -9801,89 +9925,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_ = NULL;
 				ViewCollection* _tmp43_ = NULL;
 				Marker* _tmp44_ = NULL;
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/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 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9839 "Page.c"
+#line 9963 "Page.c"
 			}
 		}
 	} else {
-#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9845 "Page.c"
+#line 9969 "Page.c"
 			default:
 			{
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9852 "Page.c"
+#line 9976 "Page.c"
 			}
 		}
 	}
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9864 "Page.c"
+#line 9988 "Page.c"
 	}
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 9868 "Page.c"
+#line 9992 "Page.c"
 		GdkEventKey* _tmp47_ = NULL;
 		gboolean _tmp48_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/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 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 9877 "Page.c"
+#line 10001 "Page.c"
 	} else {
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 9881 "Page.c"
+#line 10005 "Page.c"
 	}
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9887 "Page.c"
+#line 10011 "Page.c"
 }
 
 
@@ -9907,62 +10031,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_ = NULL;
 	gint _tmp108_ = 0;
 	gboolean _tmp109_ = FALSE;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 9921 "Page.c"
+#line 10045 "Page.c"
 		GdkEventButton* _tmp3_ = NULL;
 		GdkEventType _tmp4_ = 0;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 9930 "Page.c"
+#line 10054 "Page.c"
 	} else {
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9934 "Page.c"
+#line 10058 "Page.c"
 	}
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9942 "Page.c"
+#line 10066 "Page.c"
 	}
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 9966 "Page.c"
+#line 10090 "Page.c"
 		CheckerboardLayout* _tmp13_ = NULL;
 		CheckerboardItem* _tmp14_ = NULL;
 		GdkEventButton* _tmp15_ = NULL;
@@ -9975,41 +10099,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_ = 0U;
 		CheckerboardLayout* _tmp80_ = NULL;
 		CheckerboardItem* _tmp81_ = NULL;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10005 "Page.c"
+#line 10129 "Page.c"
 		}
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10013 "Page.c"
+#line 10137 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_ = NULL;
@@ -10022,68 +10146,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_ = NULL;
 				CheckerboardItem* _tmp31_ = NULL;
 				gboolean _tmp32_ = FALSE;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/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 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10056 "Page.c"
+#line 10180 "Page.c"
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardItem* _tmp34_ = NULL;
 					CheckerboardItem* _tmp35_ = NULL;
 					CheckerboardItem* _tmp36_ = NULL;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10077 "Page.c"
+#line 10201 "Page.c"
 				}
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10083 "Page.c"
+#line 10207 "Page.c"
 			}
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10087 "Page.c"
+#line 10211 "Page.c"
 			{
 				ViewCollection* _tmp37_ = NULL;
 				ViewCollection* _tmp38_ = NULL;
@@ -10092,92 +10216,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_ = NULL;
 				CheckerboardItem* _tmp44_ = NULL;
 				CheckerboardItem* _tmp45_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10108 "Page.c"
+#line 10232 "Page.c"
 					CheckerboardItem* _tmp40_ = NULL;
 					CheckerboardItem* _tmp41_ = NULL;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10119 "Page.c"
+#line 10243 "Page.c"
 				}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10137 "Page.c"
+#line 10261 "Page.c"
 			}
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10141 "Page.c"
+#line 10265 "Page.c"
 			{
 				CheckerboardItem* _tmp46_ = NULL;
 				CheckerboardItem* _tmp49_ = NULL;
 				CheckerboardItem* _tmp50_ = NULL;
 				CheckerboardItem* _tmp51_ = NULL;
 				CheckerboardItem* _tmp52_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10152 "Page.c"
+#line 10276 "Page.c"
 					CheckerboardItem* _tmp47_ = NULL;
 					CheckerboardItem* _tmp48_ = NULL;
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10163 "Page.c"
+#line 10287 "Page.c"
 				}
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10181 "Page.c"
+#line 10305 "Page.c"
 			}
 			default:
 			{
@@ -10187,34 +10311,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_ = NULL;
 				CheckerboardItem* _tmp78_ = NULL;
 				CheckerboardItem* _tmp79_ = NULL;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10197 "Page.c"
+#line 10321 "Page.c"
 					CheckerboardItem* _tmp55_ = NULL;
 					CheckerboardItem* _tmp56_ = NULL;
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10208 "Page.c"
+#line 10332 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_ = NULL;
 					gboolean _tmp58_ = FALSE;
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10218 "Page.c"
+#line 10342 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_ = NULL;
 						ViewCollection* _tmp60_ = NULL;
@@ -10233,91 +10357,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_ = NULL;
 						Marker* _tmp74_ = NULL;
 						Marker* _tmp75_ = NULL;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/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 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10291 "Page.c"
+#line 10415 "Page.c"
 					}
 				}
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10312 "Page.c"
+#line 10436 "Page.c"
 			}
 		}
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10321 "Page.c"
+#line 10445 "Page.c"
 	} else {
 		guint _tmp82_ = 0U;
 		GeeArrayList* _tmp85_ = NULL;
@@ -10326,30 +10450,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_ = 0.0;
 		GdkEventButton* _tmp104_ = NULL;
 		gdouble _tmp105_ = 0.0;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10334 "Page.c"
+#line 10458 "Page.c"
 			ViewCollection* _tmp83_ = NULL;
 			ViewCollection* _tmp84_ = NULL;
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10345 "Page.c"
+#line 10469 "Page.c"
 		}
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/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 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10353 "Page.c"
+#line 10477 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_ = NULL;
@@ -10361,31 +10485,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_ = 0;
 			gint _tmp92_ = 0;
 			gint _view_index = 0;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10389 "Page.c"
+#line 10513 "Page.c"
 				gint _tmp93_ = 0;
 				gint _tmp94_ = 0;
 				gint _tmp95_ = 0;
@@ -10395,79 +10519,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_ = NULL;
 				GeeArrayList* _tmp99_ = NULL;
 				DataView* _tmp100_ = NULL;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10411 "Page.c"
+#line 10535 "Page.c"
 				}
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/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 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10429 "Page.c"
+#line 10553 "Page.c"
 			}
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10433 "Page.c"
+#line 10557 "Page.c"
 		}
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10453 "Page.c"
+#line 10577 "Page.c"
 	}
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10471 "Page.c"
+#line 10595 "Page.c"
 }
 
 
@@ -10488,152 +10612,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_ = NULL;
 	CheckerboardItem* _tmp16_ = NULL;
 	CheckerboardItem* _tmp17_ = NULL;
-#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10506 "Page.c"
+#line 10630 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		CheckerboardItem* _tmp4_ = NULL;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10526 "Page.c"
+#line 10650 "Page.c"
 	}
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10538 "Page.c"
+#line 10662 "Page.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10544 "Page.c"
+#line 10668 "Page.c"
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10561 "Page.c"
+#line 10685 "Page.c"
 	}
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10585 "Page.c"
+#line 10709 "Page.c"
 	}
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10593 "Page.c"
+#line 10717 "Page.c"
 		ViewCollection* _tmp18_ = NULL;
 		ViewCollection* _tmp19_ = NULL;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10604 "Page.c"
+#line 10728 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10614 "Page.c"
+#line 10738 "Page.c"
 			ViewCollection* _tmp22_ = NULL;
 			ViewCollection* _tmp23_ = NULL;
 			CheckerboardItem* _tmp24_ = NULL;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10628 "Page.c"
+#line 10752 "Page.c"
 		}
 	}
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10637 "Page.c"
+#line 10761 "Page.c"
 }
 
 
@@ -10654,50 +10778,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_ = NULL;
 	GdkEventButton* _tmp41_ = NULL;
 	gboolean _tmp42_ = FALSE;
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10672 "Page.c"
+#line 10796 "Page.c"
 	}
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10690 "Page.c"
+#line 10814 "Page.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10701 "Page.c"
+#line 10825 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_ = NULL;
@@ -10708,63 +10832,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_ = NULL;
 				ViewCollection* _tmp16_ = NULL;
 				Marker* _tmp17_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/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 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10740 "Page.c"
+#line 10864 "Page.c"
 			}
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10744 "Page.c"
+#line 10868 "Page.c"
 			{
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10748 "Page.c"
+#line 10872 "Page.c"
 			}
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10752 "Page.c"
+#line 10876 "Page.c"
 			{
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10756 "Page.c"
+#line 10880 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 10768 "Page.c"
+#line 10892 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_ = NULL;
 					ViewCollection* _tmp21_ = NULL;
@@ -10783,99 +10907,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_ = NULL;
 					Marker* _tmp35_ = NULL;
 					Marker* _tmp36_ = NULL;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/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 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 10841 "Page.c"
+#line 10965 "Page.c"
 				}
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10845 "Page.c"
+#line 10969 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 10859 "Page.c"
+#line 10983 "Page.c"
 	}
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10879 "Page.c"
+#line 11003 "Page.c"
 }
 
 
@@ -10889,105 +11013,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_ = NULL;
 	CheckerboardItem* _tmp12_ = NULL;
 	CheckerboardItem* _tmp13_ = NULL;
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 10899 "Page.c"
+#line 11023 "Page.c"
 		CheckerboardLayout* _tmp1_ = NULL;
 		CheckerboardItem* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkModifierType _tmp5_ = 0;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 10917 "Page.c"
+#line 11041 "Page.c"
 	}
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10929 "Page.c"
+#line 11053 "Page.c"
 	}
-#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 10935 "Page.c"
+#line 11059 "Page.c"
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 10945 "Page.c"
+#line 11069 "Page.c"
 	}
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10955 "Page.c"
+#line 11079 "Page.c"
 	}
-#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10973 "Page.c"
+#line 11097 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 10982 "Page.c"
+#line 11106 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10991 "Page.c"
+#line 11115 "Page.c"
 }
 
 
@@ -11010,95 +11134,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11044 "Page.c"
+#line 11168 "Page.c"
 	}
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11056 "Page.c"
+#line 11180 "Page.c"
 	}
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11072 "Page.c"
+#line 11196 "Page.c"
 		GtkAdjustment* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/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 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11084 "Page.c"
+#line 11208 "Page.c"
 	} else {
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11088 "Page.c"
+#line 11212 "Page.c"
 	}
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/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 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11096 "Page.c"
+#line 11220 "Page.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11102 "Page.c"
+#line 11226 "Page.c"
 }
 
 
@@ -11135,91 +11259,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_ = NULL;
 	ViewCollection* _tmp48_ = NULL;
 	Marker* _tmp49_ = NULL;
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11161 "Page.c"
+#line 11285 "Page.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11223 "Page.c"
+#line 11347 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_ = NULL;
@@ -11229,25 +11353,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gint _item_index = 0;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11251 "Page.c"
+#line 11375 "Page.c"
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
@@ -11259,109 +11383,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			CheckerboardItem* _tmp41_ = NULL;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11275 "Page.c"
+#line 11399 "Page.c"
 			}
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11293 "Page.c"
+#line 11417 "Page.c"
 				Marker* _tmp37_ = NULL;
 				CheckerboardItem* _tmp38_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11302 "Page.c"
+#line 11426 "Page.c"
 			} else {
 				Marker* _tmp39_ = NULL;
 				CheckerboardItem* _tmp40_ = NULL;
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11312 "Page.c"
+#line 11436 "Page.c"
 			}
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11318 "Page.c"
+#line 11442 "Page.c"
 				CheckerboardItem* _tmp42_ = NULL;
 				CheckerboardItem* _tmp43_ = NULL;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11329 "Page.c"
+#line 11453 "Page.c"
 			}
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11333 "Page.c"
+#line 11457 "Page.c"
 		}
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11337 "Page.c"
+#line 11461 "Page.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11365 "Page.c"
+#line 11489 "Page.c"
 }
 
 
@@ -11393,77 +11517,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_ = NULL;
 	gdouble _tmp29_ = 0.0;
 	gint _tmp30_ = 0;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11411 "Page.c"
+#line 11535 "Page.c"
 	}
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/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 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/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 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11443 "Page.c"
+#line 11567 "Page.c"
 		{
 			gint _tmp12_ = 0;
 			CheckerboardLayout* _tmp13_ = NULL;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11463 "Page.c"
+#line 11587 "Page.c"
 		}
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11467 "Page.c"
+#line 11591 "Page.c"
 		{
 			gint _tmp16_ = 0;
 			CheckerboardLayout* _tmp17_ = NULL;
@@ -11471,78 +11595,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_ = 0;
 			GtkAdjustment* _tmp20_ = NULL;
 			gdouble _tmp21_ = 0.0;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11493 "Page.c"
+#line 11617 "Page.c"
 		}
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11497 "Page.c"
+#line 11621 "Page.c"
 		{
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11507 "Page.c"
+#line 11631 "Page.c"
 		}
 		default:
 		{
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11515 "Page.c"
+#line 11639 "Page.c"
 		}
 	}
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11546 "Page.c"
+#line 11670 "Page.c"
 }
 
 
@@ -11573,35 +11697,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_ = 0.0;
 	GtkAdjustment* _tmp53_ = NULL;
 	gint _tmp54_ = 0;
-#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/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 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11605 "Page.c"
+#line 11729 "Page.c"
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		Marker* marker = NULL;
@@ -11613,67 +11737,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_ = NULL;
 		ViewCollection* _tmp15_ = NULL;
 		Marker* _tmp16_ = NULL;
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/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 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11651 "Page.c"
+#line 11775 "Page.c"
 	}
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/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 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11677 "Page.c"
+#line 11801 "Page.c"
 		GtkAdjustment* _tmp27_ = NULL;
 		CheckerboardItem* _tmp28_ = NULL;
 		GdkRectangle _tmp29_ = {0};
@@ -11682,70 +11806,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_ = {0};
 		gint _tmp33_ = 0;
 		AdjustmentRelation _tmp34_ = 0;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11704 "Page.c"
+#line 11828 "Page.c"
 	} else {
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11708 "Page.c"
+#line 11832 "Page.c"
 	}
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11716 "Page.c"
+#line 11840 "Page.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11732 "Page.c"
+#line 11856 "Page.c"
 		CheckerboardItem* _tmp40_ = NULL;
 		GdkRectangle _tmp41_ = {0};
 		gint _tmp42_ = 0;
 		gint _tmp43_ = 0;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11749 "Page.c"
+#line 11873 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_ = NULL;
 		GdkRectangle _tmp45_ = {0};
@@ -11756,39 +11880,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gint _tmp52_ = 0;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11782 "Page.c"
+#line 11906 "Page.c"
 	}
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 11792 "Page.c"
+#line 11916 "Page.c"
 }
 
 
@@ -11807,171 +11931,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_ = 0;
 	CheckerboardItem* _tmp28_ = NULL;
 	CheckerboardItem* _tmp29_ = NULL;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11827 "Page.c"
+#line 11951 "Page.c"
 	}
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 11833 "Page.c"
+#line 11957 "Page.c"
 		CheckerboardLayout* _tmp7_ = NULL;
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 11847 "Page.c"
+#line 11971 "Page.c"
 	} else {
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 11851 "Page.c"
+#line 11975 "Page.c"
 	}
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 11857 "Page.c"
+#line 11981 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_ = NULL;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 11865 "Page.c"
+#line 11989 "Page.c"
 			ViewCollection* _tmp12_ = NULL;
 			ViewCollection* _tmp13_ = NULL;
 			CheckerboardItem* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/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 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 11882 "Page.c"
+#line 12006 "Page.c"
 		} else {
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 11886 "Page.c"
+#line 12010 "Page.c"
 		}
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 11890 "Page.c"
+#line 12014 "Page.c"
 	}
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 11894 "Page.c"
+#line 12018 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_ = NULL;
 		CheckerboardItem* _tmp17_ = NULL;
 		CheckerboardItem* _tmp18_ = NULL;
 		CheckerboardItem* _tmp19_ = NULL;
 		CheckerboardItem* _tmp20_ = NULL;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11923 "Page.c"
+#line 12047 "Page.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 11929 "Page.c"
+#line 12053 "Page.c"
 		CheckerboardLayout* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 11943 "Page.c"
+#line 12067 "Page.c"
 		}
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 11949 "Page.c"
+#line 12073 "Page.c"
 	}
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 11965 "Page.c"
+#line 12089 "Page.c"
 		CheckerboardItem* _tmp30_ = NULL;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 11971 "Page.c"
+#line 12095 "Page.c"
 	}
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 11975 "Page.c"
+#line 12099 "Page.c"
 }
 
 
@@ -11988,51 +12112,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_ = NULL;
 	CheckerboardItem* _tmp9_ = NULL;
 	CheckerboardItem* _tmp10_ = NULL;
-#line 1878 "/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 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/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 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12036 "Page.c"
+#line 12160 "Page.c"
 }
 
 
@@ -12047,29 +12171,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_ = NULL;
 	ViewCollection* _tmp29_ = NULL;
 	Marker* _tmp30_ = NULL;
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12073 "Page.c"
+#line 12197 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -12078,27 +12202,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12102 "Page.c"
+#line 12226 "Page.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			DataObject* object = NULL;
@@ -12115,125 +12239,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_ = FALSE;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12127 "Page.c"
+#line 12251 "Page.c"
 			}
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12149 "Page.c"
+#line 12273 "Page.c"
 			}
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12159 "Page.c"
+#line 12283 "Page.c"
 			}
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12167 "Page.c"
+#line 12291 "Page.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12174 "Page.c"
+#line 12298 "Page.c"
 			}
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12178 "Page.c"
+#line 12302 "Page.c"
 				Marker* _tmp23_ = NULL;
 				DataObject* _tmp24_ = NULL;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/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 12187 "Page.c"
+#line 12311 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12193 "Page.c"
+#line 12317 "Page.c"
 				gboolean _tmp27_ = FALSE;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12199 "Page.c"
+#line 12323 "Page.c"
 			} else {
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12203 "Page.c"
+#line 12327 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12213 "Page.c"
+#line 12337 "Page.c"
 			}
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12219 "Page.c"
+#line 12343 "Page.c"
 		}
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12223 "Page.c"
+#line 12347 "Page.c"
 	}
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12237 "Page.c"
+#line 12361 "Page.c"
 }
 
 
@@ -12241,65 +12365,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12253 "Page.c"
+#line 12377 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_ = NULL;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12260 "Page.c"
+#line 12384 "Page.c"
 	}
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12266 "Page.c"
+#line 12390 "Page.c"
 	}
-#line 1915 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1915 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12272 "Page.c"
+#line 12396 "Page.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		CheckerboardItem* _tmp6_ = NULL;
 		CheckerboardItem* _tmp7_ = NULL;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12291 "Page.c"
+#line 12415 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12303 "Page.c"
+#line 12427 "Page.c"
 	}
 }
 
@@ -12313,48 +12437,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/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 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12349 "Page.c"
+#line 12473 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12358 "Page.c"
+#line 12482 "Page.c"
 }
 
 
@@ -12367,48 +12491,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/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 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12403 "Page.c"
+#line 12527 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12412 "Page.c"
+#line 12536 "Page.c"
 }
 
 
@@ -12421,54 +12545,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12453 "Page.c"
+#line 12577 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12465 "Page.c"
+#line 12589 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12472 "Page.c"
+#line 12596 "Page.c"
 }
 
 
@@ -12484,113 +12608,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12532 "Page.c"
+#line 12656 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12562 "Page.c"
+#line 12686 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject* obj) {
 	CheckerboardPage * self;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1271 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (self->priv->item_context_menu);
 #line 1283 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (self->priv->item_context_menu);
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12594 "Page.c"
+#line 12718 "Page.c"
 }
 
 
@@ -12619,18 +12743,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 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12625 "Page.c"
+#line 12749 "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 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12634 "Page.c"
+#line 12758 "Page.c"
 }
 
 
@@ -12650,71 +12774,71 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_ = NULL;
 	GtkDrawingArea* _tmp12_ = NULL;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/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 1979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/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 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/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 1982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/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 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/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 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/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 1988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/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 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/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 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/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 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/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 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12718 "Page.c"
+#line 12842 "Page.c"
 }
 
 
@@ -12722,38 +12846,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12736 "Page.c"
+#line 12860 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 12751 "Page.c"
+#line 12875 "Page.c"
 		TransitionClock* _tmp2_ = NULL;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 12757 "Page.c"
+#line 12881 "Page.c"
 	}
 }
 
@@ -12765,53 +12889,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_ = NULL;
 	TransitionClock* _tmp4_ = NULL;
 	gint _tmp8_ = 0;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 12793 "Page.c"
+#line 12917 "Page.c"
 		TransitionEffectsManager* _tmp5_ = NULL;
 		TransitionEffectsManager* _tmp6_ = NULL;
 		TransitionClock* _tmp7_ = NULL;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 12809 "Page.c"
+#line 12933 "Page.c"
 	}
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 12815 "Page.c"
+#line 12939 "Page.c"
 }
 
 
@@ -12843,86 +12967,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
 	cairo_t* _tmp51_ = NULL;
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12869 "Page.c"
+#line 12993 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		GdkPixbuf* _tmp15_ = NULL;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 12877 "Page.c"
+#line 13001 "Page.c"
 			ZoomBuffer* _tmp7_ = NULL;
 			ZoomBuffer* _tmp8_ = NULL;
 			ZoomState _tmp9_ = {0};
 			GdkPixbuf* _tmp10_ = NULL;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 12896 "Page.c"
+#line 13020 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_ = NULL;
 			ZoomBuffer* _tmp12_ = NULL;
 			ZoomState _tmp13_ = {0};
 			GdkPixbuf* _tmp14_ = NULL;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 12916 "Page.c"
+#line 13040 "Page.c"
 		}
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 12926 "Page.c"
+#line 13050 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_ = NULL;
@@ -12944,113 +13068,113 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPixbuf* _tmp33_ = NULL;
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 12994 "Page.c"
+#line 13118 "Page.c"
 	}
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13004 "Page.c"
+#line 13128 "Page.c"
 	}
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13054 "Page.c"
+#line 13178 "Page.c"
 }
 
 
@@ -13062,39 +13186,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13098 "Page.c"
+#line 13222 "Page.c"
 }
 
 
@@ -13106,230 +13230,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13142 "Page.c"
+#line 13266 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13152 "Page.c"
+#line 13276 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13161 "Page.c"
+#line 13285 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_ = NULL;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13171 "Page.c"
+#line 13295 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13182 "Page.c"
+#line 13306 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13192 "Page.c"
+#line 13316 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_ = {0};
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13204 "Page.c"
+#line 13328 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13213 "Page.c"
+#line 13337 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13226 "Page.c"
+#line 13350 "Page.c"
 	}
-#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13236 "Page.c"
+#line 13360 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13245 "Page.c"
+#line 13369 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13255 "Page.c"
+#line 13379 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13264 "Page.c"
+#line 13388 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_ = {0};
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13278 "Page.c"
+#line 13402 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13297 "Page.c"
+#line 13421 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13316 "Page.c"
+#line 13440 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_ = NULL;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/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 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13333 "Page.c"
+#line 13457 "Page.c"
 	}
 }
 
@@ -13338,21 +13462,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/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 2135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/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 13356 "Page.c"
+#line 13480 "Page.c"
 	}
 }
 
@@ -13369,92 +13493,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_ = NULL;
 	GtkDrawingArea* _tmp9_ = NULL;
 	Direction* _tmp10_ = NULL;
-#line 2143 "/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 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13423 "Page.c"
+#line 13547 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
-#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13451 "Page.c"
+#line 13575 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13458 "Page.c"
+#line 13582 "Page.c"
 }
 
 
@@ -13462,38 +13586,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 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13476 "Page.c"
+#line 13600 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 2178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/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 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13490 "Page.c"
+#line 13614 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13497 "Page.c"
+#line 13621 "Page.c"
 }
 
 
@@ -13501,17 +13625,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13515 "Page.c"
+#line 13639 "Page.c"
 }
 
 
@@ -13521,25 +13645,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_ = 0;
 	cairo_t* _tmp3_ = NULL;
 	PangoLayout* _tmp4_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13543 "Page.c"
+#line 13667 "Page.c"
 }
 
 
@@ -13548,55 +13672,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13564 "Page.c"
+#line 13688 "Page.c"
 		GtkWindow* _tmp4_ = NULL;
 		GtkWindow* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		Scaling _tmp7_ = {0};
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13581 "Page.c"
+#line 13705 "Page.c"
 	} else {
 		GtkViewport* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		Scaling _tmp10_ = {0};
-#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13594 "Page.c"
+#line 13718 "Page.c"
 	}
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13600 "Page.c"
+#line 13724 "Page.c"
 }
 
 
@@ -13604,17 +13728,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13618 "Page.c"
+#line 13742 "Page.c"
 }
 
 
@@ -13622,31 +13746,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2200 "/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 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13636 "Page.c"
+#line 13760 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13650 "Page.c"
+#line 13774 "Page.c"
 }
 
 
@@ -13656,50 +13780,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_ = 0;
 	GdkRectangle _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13674 "Page.c"
+#line 13798 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13691 "Page.c"
+#line 13815 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
 		GdkRectangle _tmp4_ = {0};
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13703 "Page.c"
+#line 13827 "Page.c"
 	}
 }
 
@@ -13707,51 +13831,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 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13719 "Page.c"
+#line 13843 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13728 "Page.c"
+#line 13852 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13738 "Page.c"
+#line 13862 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/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 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 13755 "Page.c"
+#line 13879 "Page.c"
 }
 
 
@@ -13762,114 +13886,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	cairo_t* _tmp7_ = NULL;
-#line 2235 "/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 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13774 "Page.c"
+#line 13898 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_surface_t* _tmp2_ = NULL;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 13783 "Page.c"
+#line 13907 "Page.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 13790 "Page.c"
+#line 13914 "Page.c"
 	}
-#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/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 2243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/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 2243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13808 "Page.c"
+#line 13932 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 13817 "Page.c"
+#line 13941 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2249 "/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 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 13826 "Page.c"
+#line 13950 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 13835 "Page.c"
+#line 13959 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 13844 "Page.c"
+#line 13968 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13859 "Page.c"
+#line 13983 "Page.c"
 		gboolean _tmp2_ = FALSE;
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 13865 "Page.c"
+#line 13989 "Page.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 13869 "Page.c"
+#line 13993 "Page.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 13873 "Page.c"
+#line 13997 "Page.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -13878,31 +14002,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 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 13906 "Page.c"
+#line 14030 "Page.c"
 	} else {
 		TransitionClock* _tmp11_ = NULL;
 		cairo_t* _tmp12_ = NULL;
@@ -13911,23 +14035,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		gboolean _tmp17_ = FALSE;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 13931 "Page.c"
+#line 14055 "Page.c"
 			cairo_t* _tmp18_ = NULL;
 			cairo_t* _tmp19_ = NULL;
 			Dimensions _tmp20_ = {0};
@@ -13942,56 +14066,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 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 13984 "Page.c"
+#line 14108 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 13995 "Page.c"
+#line 14119 "Page.c"
 }
 
 
@@ -13999,44 +14123,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14011 "Page.c"
+#line 14135 "Page.c"
 	}
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14021 "Page.c"
+#line 14145 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_ = NULL;
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14033 "Page.c"
+#line 14157 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14040 "Page.c"
+#line 14164 "Page.c"
 }
 
 
@@ -14079,171 +14203,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_ = NULL;
 	TransitionClock* _tmp98_ = NULL;
 	gboolean _tmp99_ = FALSE;
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14099 "Page.c"
+#line 14223 "Page.c"
 	}
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14107 "Page.c"
+#line 14231 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_ = NULL;
 		GdkWindow* _tmp4_ = NULL;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14117 "Page.c"
+#line 14241 "Page.c"
 	}
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14123 "Page.c"
+#line 14247 "Page.c"
 	}
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14149 "Page.c"
+#line 14273 "Page.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14156 "Page.c"
+#line 14280 "Page.c"
 	}
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14162 "Page.c"
+#line 14286 "Page.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14188 "Page.c"
+#line 14312 "Page.c"
 	} else {
 		Dimensions _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14201 "Page.c"
+#line 14325 "Page.c"
 	}
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14209 "Page.c"
+#line 14333 "Page.c"
 	}
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14217 "Page.c"
+#line 14341 "Page.c"
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14228 "Page.c"
+#line 14352 "Page.c"
 	}
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14236 "Page.c"
+#line 14360 "Page.c"
 	} else {
 		gboolean _tmp30_ = FALSE;
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14243 "Page.c"
+#line 14367 "Page.c"
 	}
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14247 "Page.c"
+#line 14371 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
@@ -14268,155 +14392,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_ = 0;
 		Dimensions _tmp61_ = {0};
 		gint _tmp62_ = 0;
-#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14284 "Page.c"
+#line 14408 "Page.c"
 			gboolean _tmp37_ = FALSE;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14290 "Page.c"
+#line 14414 "Page.c"
 		} else {
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14294 "Page.c"
+#line 14418 "Page.c"
 		}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14298 "Page.c"
+#line 14422 "Page.c"
 			Dimensions _tmp38_ = {0};
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14310 "Page.c"
+#line 14434 "Page.c"
 		} else {
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14314 "Page.c"
+#line 14438 "Page.c"
 		}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14318 "Page.c"
+#line 14442 "Page.c"
 			Dimensions _tmp41_ = {0};
 			gint _tmp42_ = 0;
 			gint _tmp43_ = 0;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14330 "Page.c"
+#line 14454 "Page.c"
 		} else {
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14334 "Page.c"
+#line 14458 "Page.c"
 		}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14338 "Page.c"
+#line 14462 "Page.c"
 			Dimensions _tmp44_ = {0};
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14344 "Page.c"
+#line 14468 "Page.c"
 		} else {
 			Dimensions _tmp45_ = {0};
 			Dimensions _tmp46_ = {0};
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14354 "Page.c"
+#line 14478 "Page.c"
 		}
-#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14400 "Page.c"
+#line 14524 "Page.c"
 	}
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14408 "Page.c"
+#line 14532 "Page.c"
 	} else {
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14412 "Page.c"
+#line 14536 "Page.c"
 	}
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14420 "Page.c"
+#line 14544 "Page.c"
 		GdkPixbuf* _tmp66_ = NULL;
 		GdkRectangle _tmp67_ = {0};
 		Dimensions _tmp68_ = {0};
@@ -14431,101 +14555,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_ = NULL;
 		SinglePhotoPageUpdateReason _tmp80_ = 0;
 		Dimensions _tmp81_ = {0};
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14457 "Page.c"
+#line 14581 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_ = FALSE;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14465 "Page.c"
+#line 14589 "Page.c"
 				GdkInterpType _tmp74_ = 0;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14471 "Page.c"
+#line 14595 "Page.c"
 			} else {
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14475 "Page.c"
+#line 14599 "Page.c"
 			}
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14481 "Page.c"
+#line 14605 "Page.c"
 			}
 		}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14502 "Page.c"
+#line 14626 "Page.c"
 	}
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14512 "Page.c"
+#line 14636 "Page.c"
 		TransitionClock* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14521 "Page.c"
+#line 14645 "Page.c"
 	} else {
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14525 "Page.c"
+#line 14649 "Page.c"
 	}
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14529 "Page.c"
+#line 14653 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkRectangle _tmp88_ = {0};
@@ -14538,45 +14662,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_ = NULL;
 		SpitTransitionsDirection _tmp96_ = 0;
 		gint _tmp97_ = 0;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/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 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14570 "Page.c"
+#line 14694 "Page.c"
 	}
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14580 "Page.c"
+#line 14704 "Page.c"
 	}
 }
 
@@ -14597,65 +14721,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 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14659 "Page.c"
+#line 14783 "Page.c"
 }
 
 
@@ -14666,23 +14790,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14686 "Page.c"
+#line 14810 "Page.c"
 }
 
 
@@ -14691,11 +14815,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14699 "Page.c"
+#line 14823 "Page.c"
 }
 
 
@@ -14704,11 +14828,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14712 "Page.c"
+#line 14836 "Page.c"
 }
 
 
@@ -14725,266 +14849,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 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14741 "Page.c"
+#line 14865 "Page.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/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 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14772 "Page.c"
+#line 14896 "Page.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 14780 "Page.c"
+#line 14904 "Page.c"
 					GdkEventKey* _tmp10_ = NULL;
 					guint32 _tmp11_ = 0U;
-#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 14791 "Page.c"
+#line 14915 "Page.c"
 				}
-#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14795 "Page.c"
+#line 14919 "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 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14801 "Page.c"
+#line 14925 "Page.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 14809 "Page.c"
+#line 14933 "Page.c"
 					GdkEventKey* _tmp13_ = NULL;
 					guint32 _tmp14_ = 0U;
-#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 14820 "Page.c"
+#line 14944 "Page.c"
 				}
-#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14824 "Page.c"
+#line 14948 "Page.c"
 			}
 		}
 	} else {
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14830 "Page.c"
+#line 14954 "Page.c"
 			default:
 			{
-#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14837 "Page.c"
+#line 14961 "Page.c"
 			}
 		}
 	}
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 14849 "Page.c"
+#line 14973 "Page.c"
 	}
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 14853 "Page.c"
+#line 14977 "Page.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/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 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 14862 "Page.c"
+#line 14986 "Page.c"
 	} else {
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 14866 "Page.c"
+#line 14990 "Page.c"
 	}
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14872 "Page.c"
+#line 14996 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 14913 "Page.c"
+#line 15037 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GtkViewport* _tmp1_ = NULL;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 14960 "Page.c"
+#line 15084 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject* obj) {
 	SinglePhotoPage * self;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 14988 "Page.c"
+#line 15112 "Page.c"
 }
 
 
@@ -15001,32 +15125,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 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15007 "Page.c"
+#line 15131 "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 2507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15014 "Page.c"
+#line 15138 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15021 "Page.c"
+#line 15145 "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 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15030 "Page.c"
+#line 15154 "Page.c"
 }
 
 
@@ -15044,20 +15168,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15054 "Page.c"
+#line 15178 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15061 "Page.c"
+#line 15185 "Page.c"
 }
 
 
@@ -15078,117 +15202,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_ = NULL;
 	GtkWidget* _tmp18_ = NULL;
 	GtkWidget* _tmp19_ = NULL;
-#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15112 "Page.c"
+#line 15236 "Page.c"
 		GdkAtom _tmp7_ = 0U;
 		GdkAtom* _tmp8_ = NULL;
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15123 "Page.c"
+#line 15247 "Page.c"
 	}
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15129 "Page.c"
+#line 15253 "Page.c"
 		GdkAtom _tmp10_ = 0U;
 		GdkAtom* _tmp11_ = NULL;
-#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15140 "Page.c"
+#line 15264 "Page.c"
 	}
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15148 "Page.c"
+#line 15272 "Page.c"
 		gint _tmp13_ = 0;
 		guchar* _tmp14_ = NULL;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/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 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15161 "Page.c"
+#line 15285 "Page.c"
 	}
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/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 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/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 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/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 2500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/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 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/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 2476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15185 "Page.c"
+#line 15309 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15192 "Page.c"
+#line 15316 "Page.c"
 }
 
 
@@ -15214,119 +15338,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 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2517: on_drag_begin (%s)", _tmp2_);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2529: on_drag_begin (%s)", _tmp2_);
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15238 "Page.c"
+#line 15362 "Page.c"
 	} else {
 		Page* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15256 "Page.c"
+#line 15380 "Page.c"
 	}
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15262 "Page.c"
+#line 15386 "Page.c"
 	} else {
 		ExporterUI* _tmp10_ = NULL;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15269 "Page.c"
+#line 15393 "Page.c"
 	}
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15275 "Page.c"
+#line 15399 "Page.c"
 	}
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15301 "Page.c"
+#line 15425 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_ = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		GtkWidget* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15316 "Page.c"
-			goto __catch252_g_error;
+#line 15440 "Page.c"
+			goto __catch254_g_error;
 		}
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15327 "Page.c"
+#line 15451 "Page.c"
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally254;
+	__catch254_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_ = NULL;
@@ -15334,58 +15458,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2531: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2543: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15358 "Page.c"
+#line 15482 "Page.c"
 	}
-	__finally252:
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally254:
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/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 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15371 "Page.c"
+#line 15495 "Page.c"
 	}
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15389 "Page.c"
+#line 15513 "Page.c"
 }
 
 
@@ -15396,61 +15520,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_ = NULL;
 	guint _tmp9_ = 0U;
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2547: on_drag_data_get (%s)", _tmp2_);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2559: on_drag_data_get (%s)", _tmp2_);
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15422 "Page.c"
+#line 15546 "Page.c"
 	} else {
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15440 "Page.c"
+#line 15564 "Page.c"
 	}
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15446 "Page.c"
+#line 15570 "Page.c"
 	}
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15454 "Page.c"
+#line 15578 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_ = NULL;
@@ -15486,83 +15610,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 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/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 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15532 "Page.c"
+#line 15656 "Page.c"
 				guchar* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15541 "Page.c"
+#line 15665 "Page.c"
 			} else {
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15545 "Page.c"
+#line 15669 "Page.c"
 			}
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15549 "Page.c"
+#line 15673 "Page.c"
 				guchar* _tmp25_ = NULL;
 				gint _tmp25__length1 = 0;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15558 "Page.c"
+#line 15682 "Page.c"
 			} else {
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15562 "Page.c"
+#line 15686 "Page.c"
 			}
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15566 "Page.c"
+#line 15690 "Page.c"
 				guchar* _tmp26_ = NULL;
 				gint _tmp26__length1 = 0;
 				gchar* _tmp27_ = NULL;
@@ -15570,103 +15694,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15596 "Page.c"
+#line 15720 "Page.c"
 			}
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15602 "Page.c"
+#line 15726 "Page.c"
 				GFile* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15613 "Page.c"
+#line 15737 "Page.c"
 			} else {
 				gchar* _tmp36_ = NULL;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15622 "Page.c"
+#line 15746 "Page.c"
 			}
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2566: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2578: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15640 "Page.c"
+#line 15764 "Page.c"
 			} else {
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15644 "Page.c"
+#line 15768 "Page.c"
 			}
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15666 "Page.c"
+#line 15790 "Page.c"
 		}
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15670 "Page.c"
+#line 15794 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_ = NULL;
@@ -15681,41 +15805,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 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15719 "Page.c"
+#line 15843 "Page.c"
 		}
 		default:
 		{
@@ -15723,30 +15847,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 			guint _tmp61_ = 0U;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2585: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2597: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15741 "Page.c"
+#line 15865 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 15750 "Page.c"
+#line 15874 "Page.c"
 }
 
 
@@ -15765,99 +15889,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2592: on_drag_end (%s)", _tmp2_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2604: on_drag_end (%s)", _tmp2_);
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 15787 "Page.c"
+#line 15911 "Page.c"
 	} else {
 		Page* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 15805 "Page.c"
+#line 15929 "Page.c"
 	}
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15811 "Page.c"
+#line 15935 "Page.c"
 	} else {
 		GFile* _tmp11_ = NULL;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 15818 "Page.c"
+#line 15942 "Page.c"
 	}
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15824 "Page.c"
+#line 15948 "Page.c"
 	} else {
 		ExporterUI* _tmp12_ = NULL;
-#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 15831 "Page.c"
+#line 15955 "Page.c"
 	}
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15837 "Page.c"
+#line 15961 "Page.c"
 	}
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2599: Exporting to %s", _tmp15_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2611: Exporting to %s", _tmp15_);
+#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 15861 "Page.c"
+#line 15985 "Page.c"
 		Page* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		ViewCollection* _tmp22_ = NULL;
@@ -15870,56 +15994,56 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_ = NULL;
 		ExporterUI* _tmp30_ = NULL;
 		ExporterUI* _tmp31_ = NULL;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 15910 "Page.c"
+#line 16034 "Page.c"
 	} else {
 		const gchar* _tmp32_ = NULL;
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 15917 "Page.c"
+#line 16041 "Page.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 15923 "Page.c"
+#line 16047 "Page.c"
 }
 
 
@@ -15930,271 +16054,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_ = NULL;
 	GtkDragResult _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2617: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2629: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 15958 "Page.c"
+#line 16082 "Page.c"
 	}
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15968 "Page.c"
+#line 16092 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 15979 "Page.c"
+#line 16103 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 15986 "Page.c"
+#line 16110 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 15995 "Page.c"
+#line 16119 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 16005 "Page.c"
+#line 16129 "Page.c"
 	} else {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16009 "Page.c"
+#line 16133 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16017 "Page.c"
+#line 16141 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16024 "Page.c"
+#line 16148 "Page.c"
 		DragAndDropHandler* object;
 		object = collect_values[0].v_pointer;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16031 "Page.c"
+#line 16155 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 16035 "Page.c"
+#line 16159 "Page.c"
 		}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16039 "Page.c"
+#line 16163 "Page.c"
 	} else {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16043 "Page.c"
+#line 16167 "Page.c"
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16047 "Page.c"
+#line 16171 "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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16058 "Page.c"
+#line 16182 "Page.c"
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16064 "Page.c"
+#line 16188 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16068 "Page.c"
+#line 16192 "Page.c"
 	} else {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16072 "Page.c"
+#line 16196 "Page.c"
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16076 "Page.c"
+#line 16200 "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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16090 "Page.c"
+#line 16214 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16099 "Page.c"
+#line 16223 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16119 "Page.c"
+#line 16243 "Page.c"
 	} else {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16123 "Page.c"
+#line 16247 "Page.c"
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16129 "Page.c"
+#line 16253 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/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 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16148 "Page.c"
+#line 16272 "Page.c"
 	} else {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16152 "Page.c"
+#line 16276 "Page.c"
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16158 "Page.c"
+#line 16282 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16170 "Page.c"
+#line 16294 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16183 "Page.c"
+#line 16307 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_ = NULL;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16198 "Page.c"
+#line 16322 "Page.c"
 		GtkWidget* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		GtkWidget* _tmp3_ = NULL;
@@ -16203,45 +16327,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 		guint _tmp6_ = 0U;
 		GtkWidget* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/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 2507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/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 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/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 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/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 16231 "Page.c"
+#line 16355 "Page.c"
 	}
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16245 "Page.c"
+#line 16369 "Page.c"
 }
 
 
@@ -16262,24 +16386,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16270 "Page.c"
+#line 16394 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16283 "Page.c"
+#line 16407 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index a65a1e2..06454d8 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -97,8 +97,6 @@ public abstract class Page : Gtk.ScrolledWindow {
 
         popup_menu.connect(on_context_keypress);
         
-        init_ui();
-        
         realize.connect(attach_view_signals);
     }
     
@@ -270,6 +268,7 @@ public abstract class Page : Gtk.ScrolledWindow {
     
     public virtual void switching_from() {
         in_view = false;
+        remove_actions(AppWindow.get_instance());
         if (toolbar_path != null)
             toolbar = null;
     }
@@ -277,6 +276,11 @@ public abstract class Page : Gtk.ScrolledWindow {
     public virtual void switched_to() {
         in_view = true;
         add_ui();
+        add_actions(AppWindow.get_instance());
+        int selected_count = get_view().get_selected_count();
+        int count = get_view().get_count();
+        init_actions(selected_count, count);
+        update_actions(selected_count, count);
         update_modifiers();
     }
     
@@ -288,16 +292,24 @@ public abstract class Page : Gtk.ScrolledWindow {
     }
     
     public virtual void switching_to_fullscreen(FullscreenWindow fsw) {
+        add_actions(fsw);
     }
     
     public virtual void returning_from_fullscreen(FullscreenWindow fsw) {
+        remove_actions(fsw);
+        switched_to();
     }
 
     public GLib.Action? get_action (string name) {
-        var aw = AppWindow.get_instance ();
+        GLib.ActionMap? map = null;
+        if (container is FullscreenWindow) {
+            map = container as GLib.ActionMap;
+        } else {
+            map = AppWindow.get_instance () as GLib.ActionMap;
+        }
 
-        if (aw != null) {
-            return aw.lookup_action (name);
+        if (map != null) {
+            return map.lookup_action(name);
         }
 
         return null;
@@ -468,7 +480,8 @@ public abstract class Page : Gtk.ScrolledWindow {
         return AppWindow.get_command_manager();
     }
 
-    protected virtual void add_actions () { }
+    protected virtual void add_actions (GLib.ActionMap map) { }
+    protected virtual void remove_actions (GLib.ActionMap map) { }
 
     protected void on_action_toggle (GLib.Action action, Variant? value) {
         Variant new_state = ! (bool) action.get_state ();
@@ -479,10 +492,6 @@ public abstract class Page : Gtk.ScrolledWindow {
         action.change_state (value);
     }
 
-    private void init_ui() {
-        add_actions ();
-    }
-    
     private void add_ui() {
         // Collect all UI filenames and load them into the UI manager
         Gee.List<string> ui_filenames = new Gee.ArrayList<string>();
@@ -546,6 +555,9 @@ public abstract class Page : Gtk.ScrolledWindow {
     private void on_update_actions_on_idle() {
         if (is_destroyed)
             return;
+
+        if (!this.in_view)
+            return;
         
         update_actions(get_view().get_selected_count(), get_view().get_count());
     }
@@ -562,13 +574,13 @@ public abstract class Page : Gtk.ScrolledWindow {
         }
     }
     
-    // This is called during init_ui() to collect all the UI files to be loaded into the UI
+    // This is called during add_ui() to collect all the UI files to be loaded into the UI
     // manager.  Because order is important here, call the base method *first*, then add the
     // classes' filename.
     protected virtual void init_collect_ui_filenames(Gee.List<string> ui_filenames) {
     }
 
-    // This is called during init_ui() to collect all Page.InjectedUIElements for the page.  They
+    // This is called during add_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() {
         return new InjectionGroup[0];
diff --git a/src/Photo.c b/src/Photo.c
index 776a63d..17e0e5d 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.32.1, the Vala compiler
+/* Photo.c generated by valac 0.34.4, the Vala compiler
  * generated from Photo.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch253_database_error;
+						goto __catch255_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 __finally253;
-			__catch253_database_error:
+			goto __finally255;
+			__catch255_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"
 			}
-			__finally253:
+			__finally255:
 #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"
 			}
 		}
-		__finally254:
+		__finally256:
 		{
 			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 __catch255_g_error;
+				goto __catch257_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp12_;
 #line 4618 "Photo.c"
 		}
-		goto __finally255;
-		__catch255_g_error:
+		goto __finally257;
+		__catch257_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"
 		}
-		__finally255:
+		__finally257:
 #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 __catch256_database_error;
+				goto __catch258_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 __finally256;
-	__catch256_database_error:
+	goto __finally258;
+	__catch258_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"
 	}
-	__finally256:
+	__finally258:
 #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 __catch257_database_error;
+					goto __catch259_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 __finally257;
-		__catch257_database_error:
+		goto __finally259;
+		__catch259_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"
 		}
-		__finally257:
+		__finally259:
 #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"
 		}
-		__finally258:
+		__finally260:
 		{
 			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"
 			}
 		}
-		__finally259:
+		__finally261:
 		{
 			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 __catch260_g_error;
+					goto __catch262_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 __finally260;
-			__catch260_g_error:
+			goto __finally262;
+			__catch262_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"
 			}
-			__finally260:
+			__finally262:
 #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"
 		}
-		__finally261:
+		__finally263:
 		{
 			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 __catch262_g_error;
+					goto __catch264_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 __finally263;
+							goto __finally265;
 						}
 #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"
 					}
-					__finally263:
+					__finally265:
 					{
 						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 __catch262_g_error;
+						goto __catch264_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 __catch264_g_error;
+									goto __catch266_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 5767 "Photo.c"
 							}
-							goto __finally264;
-							__catch264_g_error:
+							goto __finally266;
+							__catch266_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"
 							}
-							__finally264:
+							__finally266:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5792 "Photo.c"
-								goto __catch262_g_error;
+								goto __catch264_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 __catch262_g_error;
+					goto __catch264_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 __catch262_g_error;
+					goto __catch264_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 __catch262_g_error;
+					goto __catch264_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 __catch262_g_error;
+					goto __catch264_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 __catch262_g_error;
+					goto __catch264_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 __finally262;
-			__catch262_g_error:
+			goto __finally264;
+			__catch264_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"
 			}
-			__finally262:
+			__finally264:
 			{
 				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 __catch265_g_error;
+							goto __catch267_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
 #line 5952 "Photo.c"
 					}
-					goto __finally265;
-					__catch265_g_error:
+					goto __finally267;
+					__catch267_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"
 					}
-					__finally265:
+					__finally267:
 #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 __catch266_g_error;
+					goto __catch268_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 __catch267_g_error;
+									goto __catch269_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6097 "Photo.c"
 							}
-							goto __finally267;
-							__catch267_g_error:
+							goto __finally269;
+							__catch269_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"
 							}
-							__finally267:
+							__finally269:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6122 "Photo.c"
-								goto __catch266_g_error;
+								goto __catch268_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 __catch268_g_error;
+									goto __catch270_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6175 "Photo.c"
 							}
-							goto __finally268;
-							__catch268_g_error:
+							goto __finally270;
+							__catch270_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"
 							}
-							__finally268:
+							__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6200 "Photo.c"
-								goto __catch266_g_error;
+								goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __catch269_g_error;
+									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6262 "Photo.c"
 							}
-							goto __finally269;
-							__catch269_g_error:
+							goto __finally271;
+							__catch271_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"
 							}
-							__finally269:
+							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6287 "Photo.c"
-								goto __catch266_g_error;
+								goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __catch266_g_error;
+					goto __catch268_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 __finally266;
-			__catch266_g_error:
+			goto __finally268;
+			__catch268_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 __catch270_g_error;
+								goto __catch272_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
 #line 6475 "Photo.c"
 						}
-						goto __finally270;
-						__catch270_g_error:
+						goto __finally272;
+						__catch272_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"
 						}
-						__finally270:
+						__finally272:
 #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"
 			}
-			__finally266:
+			__finally268:
 			{
 				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 __catch271_g_error;
+							goto __catch273_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
 #line 6536 "Photo.c"
 					}
-					goto __finally271;
-					__catch271_g_error:
+					goto __finally273;
+					__catch273_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"
 					}
-					__finally271:
+					__finally273:
 #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"
 		}
-		__finally272:
+		__finally274:
 		{
 			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 __catch274_g_error;
+						goto __catch276_g_error;
 					}
 				}
-				goto __finally274;
-				__catch274_g_error:
+				goto __finally276;
+				__catch276_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"
 				}
-				__finally274:
+				__finally276:
 #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 __catch275_g_error;
+					goto __catch277_g_error;
 				}
 			}
-			goto __finally275;
-			__catch275_g_error:
+			goto __finally277;
+			__catch277_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"
 			}
-			__finally275:
+			__finally277:
 #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"
 			}
 		}
-		__finally273:
+		__finally275:
 		{
 			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 __catch277_g_error;
+							goto __catch279_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 __catch277_g_error;
+							goto __catch279_g_error;
 						}
 					}
 				}
-				goto __finally277;
-				__catch277_g_error:
+				goto __finally279;
+				__catch279_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"
 				}
-				__finally277:
+				__finally279:
 #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 __catch278_g_error;
+					goto __catch280_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 __catch278_g_error;
+					goto __catch280_g_error;
 				}
 			}
-			goto __finally278;
-			__catch278_g_error:
+			goto __finally280;
+			__catch280_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"
 			}
-			__finally278:
+			__finally280:
 #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"
 		}
-		__finally276:
+		__finally278:
 		{
 			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"
 		}
-		__finally279:
+		__finally281:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7612,7 +7612,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 #line 7613 "Photo.c"
 			}
 		}
-		__finally280:
+		__finally282:
 		{
 			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"
 		}
-		__finally281:
+		__finally283:
 		{
 			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"
 		}
-		__finally282:
+		__finally284:
 		{
 			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"
 		}
-		__finally283:
+		__finally285:
 		{
 			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"
 		}
-		__finally284:
+		__finally286:
 		{
 			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"
 		}
-		__finally285:
+		__finally287:
 		{
 			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"
 		}
-		__finally286:
+		__finally288:
 		{
 			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"
 		}
-		__finally287:
+		__finally289:
 		{
 			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"
 		}
-		__finally288:
+		__finally290:
 		{
 			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"
 		}
-		__finally289:
+		__finally291:
 		{
 			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"
 		}
-		__finally290:
+		__finally292:
 		{
 			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"
 		}
-		__finally291:
+		__finally293:
 		{
 			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"
 		}
-		__finally292:
+		__finally294:
 		{
 			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"
 			}
 		}
-		__finally293:
+		__finally295:
 		{
 			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"
 		}
-		__finally294:
+		__finally296:
 		{
 			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"
 		}
-		__finally295:
+		__finally297:
 		{
 			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 __catch296_g_error;
+			goto __catch298_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 __finally296;
-	__catch296_g_error:
+	goto __finally298;
+	__catch298_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"
 	}
-	__finally296:
+	__finally298:
 #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 __catch297_g_error;
+			goto __catch299_g_error;
 		}
 	}
-	goto __finally297;
-	__catch297_g_error:
+	goto __finally299;
+	__catch299_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"
 	}
-	__finally297:
+	__finally299:
 #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 __catch298_g_error;
+				goto __catch300_g_error;
 			}
 		}
-		goto __finally298;
-		__catch298_g_error:
+		goto __finally300;
+		__catch300_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"
 		}
-		__finally298:
+		__finally300:
 #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 __catch299_g_error;
+			goto __catch301_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 __finally299;
-	__catch299_g_error:
+	goto __finally301;
+	__catch301_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"
 	}
-	__finally299:
+	__finally301:
 #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 __catch300_g_error;
+			goto __catch302_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 __finally300;
-	__catch300_g_error:
+	goto __finally302;
+	__catch302_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"
 	}
-	__finally300:
+	__finally302:
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1316 "/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"
 		}
-		__finally301:
+		__finally303:
 		{
 			PhotoRow* _tmp26_ = NULL;
 #line 1433 "/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"
 		}
-		__finally302:
+		__finally304:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12449,7 +12449,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				photo_internal_remove_all_transformations (self, FALSE);
 #line 12449 "Photo.c"
 			}
-			__finally303:
+			__finally305:
 			{
 				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"
 						}
 					}
-					__finally304:
+					__finally306:
 					{
 						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 __finally306;
+					goto __finally308;
 				}
 #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"
 			}
-			__finally306:
+			__finally308:
 			{
 				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 __catch305_database_error;
+					goto __catch307_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 __finally305;
-	__catch305_database_error:
+	goto __finally307;
+	__catch307_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"
 	}
-	__finally305:
+	__finally307:
 #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 __finally307;
+					goto __finally309;
 				}
 #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"
 			}
 		}
-		__finally307:
+		__finally309:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1707 "/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 __finally310;
+								goto __finally312;
 							}
 #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"
 						}
 					}
-					__finally310:
+					__finally312:
 					{
 						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 __finally309;
+						goto __finally311;
 					}
 				}
 			}
-			__finally309:
+			__finally311:
 			{
 				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 __catch308_database_error;
+					goto __catch310_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 __finally308;
-	__catch308_database_error:
+	goto __finally310;
+	__catch310_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"
 	}
-	__finally308:
+	__finally310:
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1819 "/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 __finally313;
+								goto __finally315;
 							}
 #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"
 					}
-					__finally313:
+					__finally315:
 					{
 						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 __finally312;
+						goto __finally314;
 					}
 				}
 			}
-			__finally312:
+			__finally314:
 			{
 				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 __catch311_database_error;
+					goto __catch313_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 __finally311;
-	__catch311_database_error:
+	goto __finally313;
+	__catch313_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"
 	}
-	__finally311:
+	__finally313:
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15171,7 +15171,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 #line 15170 "Photo.c"
 	}
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
 #line 15176 "Photo.c"
@@ -15259,7 +15259,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 #line 15258 "Photo.c"
 			}
 		}
-		__finally314:
+		__finally316:
 		{
 			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"
 		}
-		__finally315:
+		__finally317:
 		{
 			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"
 		}
-		__finally316:
+		__finally318:
 		{
 			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"
 		}
-		__finally317:
+		__finally319:
 		{
 			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"
 		}
-		__finally318:
+		__finally320:
 		{
 			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"
 		}
-		__finally319:
+		__finally321:
 		{
 			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"
 		}
-		__finally320:
+		__finally322:
 		{
 			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"
 		}
-		__finally321:
+		__finally323:
 		{
 			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"
 		}
-		__finally322:
+		__finally324:
 		{
 			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"
 			}
 		}
-		__finally323:
+		__finally325:
 		{
 			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"
 		}
-		__finally324:
+		__finally326:
 		{
 			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
 				}
 			}
 		}
-		__finally325:
+		__finally327:
 		{
 			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
 				}
 			}
 		}
-		__finally326:
+		__finally328:
 		{
 			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
 				}
 			}
 		}
-		__finally327:
+		__finally329:
 		{
 			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
 				}
 			}
 		}
-		__finally328:
+		__finally330:
 		{
 			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"
 		}
-		__finally329:
+		__finally331:
 		{
 			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 __finally330;
+					goto __finally332;
 				}
 #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"
 			}
 		}
-		__finally330:
+		__finally332:
 		{
 			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"
 		}
-		__finally331:
+		__finally333:
 		{
 			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) {
 				}
 			}
 		}
-		__finally332:
+		__finally334:
 		{
 			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"
 		}
-		__finally333:
+		__finally335:
 		{
 			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"
 		}
-		__finally334:
+		__finally336:
 		{
 			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 __catch335_database_error;
+				goto __catch337_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"
 			}
-			__finally336:
+			__finally338:
 			{
 				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 __catch335_database_error;
+					goto __catch337_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 __finally335;
-	__catch335_database_error:
+	goto __finally337;
+	__catch337_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"
 	}
-	__finally335:
+	__finally337:
 #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"
 		}
-		__finally337:
+		__finally339:
 		{
 			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 __catch338_g_error;
+			goto __catch340_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 __finally338;
-	__catch338_g_error:
+	goto __finally340;
+	__catch340_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"
 	}
-	__finally338:
+	__finally340:
 #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 __catch339_g_error;
+			goto __catch341_g_error;
 		}
 	}
-	goto __finally339;
-	__catch339_g_error:
+	goto __finally341;
+	__catch341_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"
 	}
-	__finally339:
+	__finally341:
 #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"
 		}
-		__finally340:
+		__finally342:
 		{
 			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"
 		}
-		__finally341:
+		__finally343:
 		{
 			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"
 		}
-		__finally342:
+		__finally344:
 		{
 			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"
 		}
-		__finally343:
+		__finally345:
 		{
 			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"
 		}
-		__finally344:
+		__finally346:
 		{
 			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"
 		}
-		__finally345:
+		__finally347:
 		{
 			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"
 		}
-		__finally346:
+		__finally348:
 		{
 			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"
 			}
 		}
-		__finally347:
+		__finally349:
 		{
 			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"
 			}
 		}
-		__finally348:
+		__finally350:
 		{
 			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 __catch350_database_error;
+						goto __catch352_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 __finally350;
-			__catch350_database_error:
+			goto __finally352;
+			__catch352_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"
 			}
-			__finally350:
+			__finally352:
 #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"
 			}
 		}
-		__finally349:
+		__finally351:
 		{
 			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 __finally351;
+			goto __finally353;
 		}
 	}
-	__finally351:
+	__finally353:
 	{
 		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 __finally352;
+			goto __finally354;
 		}
 	}
-	__finally352:
+	__finally354:
 	{
 		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"
 			}
 		}
-		__finally353:
+		__finally355:
 		{
 			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 __finally354;
+			goto __finally356;
 		}
 	}
-	__finally354:
+	__finally356:
 	{
 		PhotoFileReader* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
@@ -19613,7 +19613,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			return result;
 #line 19613 "Photo.c"
 		}
-		__finally355:
+		__finally357:
 		{
 			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"
 		}
-		__finally356:
+		__finally358:
 		{
 			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"
 			}
-			__finally357:
+			__finally359:
 			{
 				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"
 		}
-		__finally358:
+		__finally360:
 		{
 			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 __catch359_g_error;
+			goto __catch361_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 __finally359;
-	__catch359_g_error:
+	goto __finally361;
+	__catch361_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"
 	}
-	__finally359:
+	__finally361:
 #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"
 		}
-		__finally360:
+		__finally362:
 		{
 			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"
 		}
-		__finally361:
+		__finally363:
 		{
 			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"
 		}
-		__finally362:
+		__finally364:
 		{
 			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"
 				}
 			}
-			__finally363:
+			__finally365:
 			{
 				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"
 		}
-		__finally364:
+		__finally366:
 		{
 			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"
 		}
-		__finally365:
+		__finally367:
 		{
 			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"
 			}
 		}
-		__finally366:
+		__finally368:
 		{
 			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"
 			}
 		}
-		__finally367:
+		__finally369:
 		{
 			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"
 		}
-		__finally368:
+		__finally370:
 		{
 			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"
 		}
-		__finally369:
+		__finally371:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21926,7 +21926,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				}
 			}
 		}
-		__finally370:
+		__finally372:
 		{
 			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"
 		}
-		__finally371:
+		__finally373:
 		{
 			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"
 		}
-		__finally372:
+		__finally374:
 		{
 			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) {
 				}
 			}
 		}
-		__finally373:
+		__finally375:
 		{
 			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"
 		}
-		__finally374:
+		__finally376:
 		{
 			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"
 		}
-		__finally375:
+		__finally377:
 		{
 			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"
 		}
-		__finally376:
+		__finally378:
 		{
 			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"
 		}
-		__finally377:
+		__finally379:
 		{
 			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 __finally378;
+					goto __finally380;
 				}
 #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"
 		}
-		__finally378:
+		__finally380:
 		{
 			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 __catch379_g_error;
+			goto __catch381_g_error;
 		}
 	}
-	goto __finally379;
-	__catch379_g_error:
+	goto __finally381;
+	__catch381_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"
 	}
-	__finally379:
+	__finally381:
 #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 __catch380_g_error;
+			goto __catch382_g_error;
 		}
 	}
-	goto __finally380;
-	__catch380_g_error:
+	goto __finally382;
+	__catch382_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"
 	}
-	__finally380:
+	__finally382:
 #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"
 		}
-		__finally381:
+		__finally383:
 		{
 			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
 				}
 			}
 		}
-		__finally382:
+		__finally384:
 		{
 			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"
 		}
-		__finally383:
+		__finally385:
 		{
 			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 __catch384_g_error;
+			goto __catch386_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 __finally384;
-	__catch384_g_error:
+	goto __finally386;
+	__catch386_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"
 	}
-	__finally384:
+	__finally386:
 #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 __finally385;
+					goto __finally387;
 				}
 #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"
 			}
 		}
-		__finally385:
+		__finally387:
 		{
 			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 __catch386_g_error;
+				goto __catch388_g_error;
 			}
 		}
-		goto __finally386;
-		__catch386_g_error:
+		goto __finally388;
+		__catch388_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 __catch387_g_error;
+					goto __catch389_g_error;
 				}
 			}
-			goto __finally387;
-			__catch387_g_error:
+			goto __finally389;
+			__catch389_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"
 			}
-			__finally387:
+			__finally389:
 #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 __finally386;
+			goto __finally388;
 		}
-		__finally386:
+		__finally388:
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3825 "/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 __finally388;
+						goto __finally390;
 					}
 #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"
 				}
-				__finally388:
+				__finally390:
 				{
 					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 __catch389_g_error;
+				goto __catch391_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 __finally389;
-		__catch389_g_error:
+		goto __finally391;
+		__catch391_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"
 		}
-		__finally389:
+		__finally391:
 #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"
 			}
-			__finally390:
+			__finally392:
 			{
 				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"
 				}
-				__finally391:
+				__finally393:
 				{
 					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"
 			}
-			__finally392:
+			__finally394:
 			{
 				PhotoBackingReaders* _tmp99_ = NULL;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29156,7 +29156,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 29153 "Photo.c"
 			}
 		}
-		__finally393:
+		__finally395:
 		{
 			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 __finally395;
+							goto __finally397;
 						}
 					}
 #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"
 				}
-				__finally395:
+				__finally397:
 				{
 					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 __catch394_database_error;
+						goto __catch396_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 __finally394;
-		__catch394_database_error:
+		goto __finally396;
+		__catch396_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"
 		}
-		__finally394:
+		__finally396:
 #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 __catch396_database_error;
+						goto __catch398_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 __finally396;
-		__catch396_database_error:
+		goto __finally398;
+		__catch398_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"
 		}
-		__finally396:
+		__finally398:
 #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 __catch397_g_error;
+				goto __catch399_g_error;
 			}
 		}
-		goto __finally397;
-		__catch397_g_error:
+		goto __finally399;
+		__catch399_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"
 		}
-		__finally397:
+		__finally399:
 #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"
 			}
 		}
-		__finally398:
+		__finally400:
 		{
 			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 __catch399_g_error;
+			goto __catch401_g_error;
 		}
 	}
-	goto __finally399;
-	__catch399_g_error:
+	goto __finally401;
+	__catch401_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"
 	}
-	__finally399:
+	__finally401:
 #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 __catch400_g_error;
+			goto __catch402_g_error;
 		}
 	}
-	goto __finally400;
-	__catch400_g_error:
+	goto __finally402;
+	__catch402_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"
 	}
-	__finally400:
+	__finally402:
 #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 __catch401_g_error;
+			goto __catch403_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 __finally401;
-	__catch401_g_error:
+	goto __finally403;
+	__catch403_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"
 	}
-	__finally401:
+	__finally403:
 #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"
 		}
-		__finally402:
+		__finally404:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34211,7 +34211,7 @@ static void photo_class_init (PhotoClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_finalize;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE);
+	g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36919,37 +36919,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 36930 "Photo.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 36938 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 36950 "Photo.c"
 	}
@@ -36969,112 +36969,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 36974 "Photo.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 36980 "Photo.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 36984 "Photo.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 36988 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 37000 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 37010 "Photo.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 37016 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 37030 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 37040 "Photo.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 37046 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 37055 "Photo.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 37075 "Photo.c"
 }
@@ -38400,11 +38400,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 #line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
 #line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_editable_file = _tmp0_;
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_raw_development_file = _tmp1_;
 #line 4466 "/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 __catch403_database_error;
+				goto __catch405_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 __finally403;
-	__catch403_database_error:
+	goto __finally405;
+	__catch405_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"
 	}
-	__finally403:
+	__finally405:
 #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 __catch404_g_error;
+			goto __catch406_g_error;
 		}
 	}
-	goto __finally404;
-	__catch404_g_error:
+	goto __finally406;
+	__catch406_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"
 	}
-	__finally404:
+	__finally406:
 #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 __catch405_g_error;
+			goto __catch407_g_error;
 		}
 	}
-	goto __finally405;
-	__catch405_g_error:
+	goto __finally407;
+	__catch407_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"
 	}
-	__finally405:
+	__finally407:
 #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 __catch406_database_error;
+				goto __catch408_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 __finally406;
-	__catch406_database_error:
+	goto __finally408;
+	__catch408_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"
 	}
-	__finally406:
+	__finally408:
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42137,19 +42137,19 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 #line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_file_map = _tmp0_;
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->development_file_map = _tmp1_;
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 42151 "Photo.c"
diff --git a/src/Photo.vala b/src/Photo.vala
index 11dbae6..222896f 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -2212,7 +2212,7 @@ public abstract class Photo : PhotoSource, Dateable {
         }
         
         // Note: *Not* firing altered or metadata_altered signal because link_state is not a
-        // property that's available to users of Photo.  Persisting it as a mechanism for deaing 
+        // property that's available to users of Photo.  Persisting it as a mechanism for dealing
         // with unlink/relink properly.
     }
 
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a6f5f2e..7d24c99 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.32.1, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1677,7 +1677,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) {
 #line 19 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->revert_to_master = FALSE;
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1684 "PhotoMonitor.c"
@@ -6226,7 +6226,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6225 "PhotoMonitor.c"
 					GeeHashMap* _tmp17_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (set_editable_file);
 #line 936 "/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 __catch580_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 __finally580;
-		__catch580_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"
 		}
-		__finally580:
+		__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 __catch581_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 __finally581;
-		__catch581_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"
 		}
-		__finally581:
+		__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 __catch582_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 __finally582;
-	__catch582_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"
 	}
-	__finally582:
+	__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 __catch583_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 __finally583;
-	__catch583_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"
 	}
-	__finally583:
+	__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 __catch584_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 __finally584;
-	__catch584_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"
 	}
-	__finally584:
+	__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 __catch585_g_error;
+			goto __catch587_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally585;
-	__catch585_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"
 	}
-	__finally585:
+	__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 __catch586_g_error;
+			goto __catch588_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally586;
-	__catch586_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"
 	}
-	__finally586:
+	__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 __catch587_g_error;
+			goto __catch589_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally587;
-	__catch587_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"
 	}
-	__finally587:
+	__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 62e90b8..5eddab0 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.32.1, the Vala compiler
+/* PhotoPage.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1165,7 +1165,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -2213,10 +2214,6 @@ 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);
@@ -2230,13 +2227,17 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 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);
+static void library_photo_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
 GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
 static GVariant* _variant_new16 (gboolean value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 static GVariant* _variant_new17 (const gchar* value);
+static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value);
+static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self);
+static void library_photo_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -2272,6 +2273,7 @@ static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget*
 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 void library_photo_page_real_switching_from (Page* base);
 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);
@@ -2397,7 +2399,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 const GActionEntry LIBRARY_PHOTO_PAGE_entries[45] = {{"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}};
 
 static GType zoom_buffer_object_state_get_type (void) {
 	static volatile gsize zoom_buffer_object_state_type_id__volatile = 0;
@@ -2414,7 +2416,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 2418 "PhotoPage.c"
+#line 2420 "PhotoPage.c"
 }
 
 
@@ -2467,28 +2469,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 2471 "PhotoPage.c"
+#line 2473 "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 2478 "PhotoPage.c"
+#line 2480 "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 2485 "PhotoPage.c"
+#line 2487 "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 2492 "PhotoPage.c"
+#line 2494 "PhotoPage.c"
 }
 
 
@@ -2542,7 +2544,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 2545 "PhotoPage.c"
+#line 2547 "PhotoPage.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = fetch_job;
@@ -2568,7 +2570,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 2571 "PhotoPage.c"
+#line 2573 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2597,7 +2599,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 2600 "PhotoPage.c"
+#line 2602 "PhotoPage.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED;
@@ -2605,13 +2607,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 2608 "PhotoPage.c"
+#line 2610 "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 2614 "PhotoPage.c"
+#line 2616 "PhotoPage.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = self->priv->iso_source_image;
@@ -2645,7 +2647,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 2648 "PhotoPage.c"
+#line 2650 "PhotoPage.c"
 }
 
 
@@ -2686,7 +2688,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 2689 "PhotoPage.c"
+#line 2691 "PhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2712,7 +2714,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 2715 "PhotoPage.c"
+#line 2717 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2741,13 +2743,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 2744 "PhotoPage.c"
+#line 2746 "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 2750 "PhotoPage.c"
+#line 2752 "PhotoPage.c"
 }
 
 
@@ -2783,7 +2785,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 2786 "PhotoPage.c"
+#line 2788 "PhotoPage.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2805,7 +2807,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 2808 "PhotoPage.c"
+#line 2810 "PhotoPage.c"
 }
 
 
@@ -2878,21 +2880,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 2881 "PhotoPage.c"
+#line 2883 "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 2887 "PhotoPage.c"
+#line 2889 "PhotoPage.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 2891 "PhotoPage.c"
+#line 2893 "PhotoPage.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 2895 "PhotoPage.c"
+#line 2897 "PhotoPage.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
@@ -2923,7 +2925,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 2926 "PhotoPage.c"
+#line 2928 "PhotoPage.c"
 	}
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = view_rect_proj;
@@ -3001,14 +3003,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 3004 "PhotoPage.c"
+#line 3006 "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 3011 "PhotoPage.c"
+#line 3013 "PhotoPage.c"
 }
 
 
@@ -3027,7 +3029,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 3030 "PhotoPage.c"
+#line 3032 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3036,7 +3038,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 3039 "PhotoPage.c"
+#line 3041 "PhotoPage.c"
 			GdkPixbuf* _tmp3_ = NULL;
 			GdkPixbuf* _tmp4_ = NULL;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3047,7 +3049,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 3050 "PhotoPage.c"
+#line 3052 "PhotoPage.c"
 		} else {
 			gdouble _tmp5_ = 0.0;
 			gdouble _tmp6_ = 0.0;
@@ -3057,7 +3059,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 3060 "PhotoPage.c"
+#line 3062 "PhotoPage.c"
 				GdkRectangle curr_rect = {0};
 				GdkRectangle _tmp7_ = {0};
 				GdkRectangle pre_rect = {0};
@@ -3377,7 +3379,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 3380 "PhotoPage.c"
+#line 3382 "PhotoPage.c"
 			}
 		}
 	}
@@ -3385,7 +3387,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 3388 "PhotoPage.c"
+#line 3390 "PhotoPage.c"
 		ZoomState _tmp98_ = {0};
 		gboolean _tmp99_ = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3394,7 +3396,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 3397 "PhotoPage.c"
+#line 3399 "PhotoPage.c"
 			ZoomState _tmp100_ = {0};
 			GdkPixbuf* _tmp101_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3405,7 +3407,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 3408 "PhotoPage.c"
+#line 3410 "PhotoPage.c"
 		} else {
 			ZoomBufferTransformationJob* _tmp102_ = NULL;
 			GdkPixbuf* zoomed = NULL;
@@ -3485,14 +3487,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 3488 "PhotoPage.c"
+#line 3490 "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 3495 "PhotoPage.c"
+#line 3497 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
 		ZoomState _tmp120_ = {0};
 		GdkPixbuf* _tmp121_ = NULL;
@@ -3562,7 +3564,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 3565 "PhotoPage.c"
+#line 3567 "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" \
@@ -3575,14 +3577,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 3577 "PhotoPage.c"
+#line 3579 "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 3584 "PhotoPage.c"
+#line 3586 "PhotoPage.c"
 }
 
 
@@ -3625,7 +3627,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 3627 "PhotoPage.c"
+#line 3629 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
 		Photo* _tmp1_ = NULL;
 		ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
@@ -3647,7 +3649,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 3649 "PhotoPage.c"
+#line 3651 "PhotoPage.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_);
@@ -3715,7 +3717,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 3717 "PhotoPage.c"
+#line 3719 "PhotoPage.c"
 }
 
 
@@ -3733,7 +3735,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	result = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3735 "PhotoPage.c"
+#line 3737 "PhotoPage.c"
 }
 
 
@@ -3752,7 +3754,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 3754 "PhotoPage.c"
+#line 3756 "PhotoPage.c"
 }
 
 
@@ -3768,7 +3770,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 3770 "PhotoPage.c"
+#line 3772 "PhotoPage.c"
 		ZoomState* _tmp1_ = NULL;
 		ZoomState _tmp2_ = {0};
 		GdkPixbuf* _tmp3_ = NULL;
@@ -3783,7 +3785,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 3785 "PhotoPage.c"
+#line 3787 "PhotoPage.c"
 	}
 }
 
@@ -3802,7 +3804,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 3804 "PhotoPage.c"
+#line 3806 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		GdkPixbuf* _tmp2_ = NULL;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3813,7 +3815,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 3815 "PhotoPage.c"
+#line 3817 "PhotoPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->object_state;
@@ -3823,7 +3825,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 3825 "PhotoPage.c"
+#line 3827 "PhotoPage.c"
 		{
 			ZoomState _tmp4_ = {0};
 			GdkPixbuf* _tmp5_ = NULL;
@@ -3835,11 +3837,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 3837 "PhotoPage.c"
+#line 3839 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
-#line 3841 "PhotoPage.c"
+#line 3843 "PhotoPage.c"
 		{
 			ZoomState _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
@@ -3851,11 +3853,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 3853 "PhotoPage.c"
+#line 3855 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
-#line 3857 "PhotoPage.c"
+#line 3859 "PhotoPage.c"
 		{
 			ZoomState _tmp8_ = {0};
 			GdkPixbuf* _tmp9_ = NULL;
@@ -3873,7 +3875,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 3875 "PhotoPage.c"
+#line 3877 "PhotoPage.c"
 		}
 		default:
 		{
@@ -3890,7 +3892,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 3891 "PhotoPage.c"
+#line 3893 "PhotoPage.c"
 		}
 	}
 }
@@ -3914,7 +3916,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 3915 "PhotoPage.c"
+#line 3917 "PhotoPage.c"
 }
 
 
@@ -3947,14 +3949,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 3948 "PhotoPage.c"
+#line 3950 "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 3955 "PhotoPage.c"
+#line 3957 "PhotoPage.c"
 }
 
 
@@ -3963,7 +3965,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 3964 "PhotoPage.c"
+#line 3966 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -3980,8 +3982,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 3981 "PhotoPage.c"
-			goto __catch240_g_error;
+#line 3983 "PhotoPage.c"
+			goto __catch242_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -3993,10 +3995,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 3994 "PhotoPage.c"
+#line 3996 "PhotoPage.c"
 	}
-	goto __finally240;
-	__catch240_g_error:
+	goto __finally242;
+	__catch242_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4008,9 +4010,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 4008 "PhotoPage.c"
+#line 4010 "PhotoPage.c"
 	}
-	__finally240:
+	__finally242:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4019,7 +4021,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 4019 "PhotoPage.c"
+#line 4021 "PhotoPage.c"
 	}
 }
 
@@ -4033,7 +4035,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 4033 "PhotoPage.c"
+#line 4035 "PhotoPage.c"
 }
 
 
@@ -4042,7 +4044,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 4042 "PhotoPage.c"
+#line 4044 "PhotoPage.c"
 }
 
 
@@ -4056,7 +4058,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 4056 "PhotoPage.c"
+#line 4058 "PhotoPage.c"
 }
 
 
@@ -4075,7 +4077,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 4075 "PhotoPage.c"
+#line 4077 "PhotoPage.c"
 }
 
 
@@ -4145,14 +4147,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT
 	self->transformed = _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4145 "PhotoPage.c"
+#line 4147 "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 4152 "PhotoPage.c"
+#line 4154 "PhotoPage.c"
 }
 
 
@@ -4165,7 +4167,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 4165 "PhotoPage.c"
+#line 4167 "PhotoPage.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
@@ -4180,7 +4182,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 4180 "PhotoPage.c"
+#line 4182 "PhotoPage.c"
 	}
 }
 
@@ -4194,7 +4196,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 4194 "PhotoPage.c"
+#line 4196 "PhotoPage.c"
 }
 
 
@@ -4203,7 +4205,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 4203 "PhotoPage.c"
+#line 4205 "PhotoPage.c"
 }
 
 
@@ -4221,7 +4223,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 4221 "PhotoPage.c"
+#line 4223 "PhotoPage.c"
 }
 
 
@@ -4244,7 +4246,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 4244 "PhotoPage.c"
+#line 4246 "PhotoPage.c"
 }
 
 
@@ -4273,7 +4275,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 4273 "PhotoPage.c"
+#line 4275 "PhotoPage.c"
 }
 
 
@@ -4303,7 +4305,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 4303 "PhotoPage.c"
+#line 4305 "PhotoPage.c"
 }
 
 
@@ -4322,77 +4324,77 @@ 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 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
-#line 4322 "PhotoPage.c"
+#line 4324 "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 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4329 "PhotoPage.c"
+#line 4331 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
 #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4336 "PhotoPage.c"
+#line 4338 "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 4343 "PhotoPage.c"
+#line 4345 "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 4350 "PhotoPage.c"
+#line 4352 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 4357 "PhotoPage.c"
+#line 4359 "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 4364 "PhotoPage.c"
+#line 4366 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
-#line 4371 "PhotoPage.c"
+#line 4373 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
-#line 4378 "PhotoPage.c"
+#line 4380 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
-#line 4385 "PhotoPage.c"
+#line 4387 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 4392 "PhotoPage.c"
+#line 4394 "PhotoPage.c"
 }
 
 
@@ -4401,14 +4403,14 @@ static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_e
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
 #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4401 "PhotoPage.c"
+#line 4403 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
-#line 4408 "PhotoPage.c"
+#line 4410 "PhotoPage.c"
 }
 
 
@@ -4417,7 +4419,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_p
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4417 "PhotoPage.c"
+#line 4419 "PhotoPage.c"
 }
 
 
@@ -4426,7 +4428,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_rel
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4426 "PhotoPage.c"
+#line 4428 "PhotoPage.c"
 }
 
 
@@ -4435,7 +4437,7 @@ static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4435 "PhotoPage.c"
+#line 4437 "PhotoPage.c"
 }
 
 
@@ -4444,21 +4446,21 @@ static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_ev
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
 #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4444 "PhotoPage.c"
+#line 4446 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 4451 "PhotoPage.c"
+#line 4453 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 4458 "PhotoPage.c"
+#line 4460 "PhotoPage.c"
 }
 
 
@@ -4969,7 +4971,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 4969 "PhotoPage.c"
+#line 4971 "PhotoPage.c"
 }
 
 
@@ -4993,7 +4995,7 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
 #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 4993 "PhotoPage.c"
+#line 4995 "PhotoPage.c"
 		ZoomState _tmp4_ = {0};
 		gboolean _tmp5_ = FALSE;
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5004,13 +5006,13 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5004 "PhotoPage.c"
+#line 5006 "PhotoPage.c"
 			ZoomState _tmp6_ = {0};
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
 #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 5010 "PhotoPage.c"
+#line 5012 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_ = FALSE;
@@ -5020,22 +5022,22 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		if (_tmp7_) {
 #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 5020 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_ = {0};
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
 #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 5027 "PhotoPage.c"
+#line 5029 "PhotoPage.c"
 		}
 #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 5031 "PhotoPage.c"
+#line 5033 "PhotoPage.c"
 	}
 #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5035 "PhotoPage.c"
+#line 5037 "PhotoPage.c"
 }
 
 
@@ -5060,7 +5062,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	_g_object_unref0 (_tmp1_);
 #line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5060 "PhotoPage.c"
+#line 5062 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
 #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5071,13 +5073,13 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
 #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5071 "PhotoPage.c"
+#line 5073 "PhotoPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5077 "PhotoPage.c"
+#line 5079 "PhotoPage.c"
 }
 
 
@@ -5107,7 +5109,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	_g_object_unref0 (_tmp1_);
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5107 "PhotoPage.c"
+#line 5109 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
 #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5118,7 +5120,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
 #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5118 "PhotoPage.c"
+#line 5120 "PhotoPage.c"
 	}
 #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_);
@@ -5138,7 +5140,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	result = FALSE;
 #line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5138 "PhotoPage.c"
+#line 5140 "PhotoPage.c"
 }
 
 
@@ -5154,7 +5156,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
 	result = TRUE;
 #line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5154 "PhotoPage.c"
+#line 5156 "PhotoPage.c"
 }
 
 
@@ -5170,7 +5172,7 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
 	result = TRUE;
 #line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5170 "PhotoPage.c"
+#line 5172 "PhotoPage.c"
 }
 
 
@@ -5282,7 +5284,7 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	*result = _result_;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5282 "PhotoPage.c"
+#line 5284 "PhotoPage.c"
 }
 
 
@@ -5344,7 +5346,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	*result = _tmp11_;
 #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5344 "PhotoPage.c"
+#line 5346 "PhotoPage.c"
 }
 
 
@@ -5402,7 +5404,7 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	*result = _tmp12_;
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5402 "PhotoPage.c"
+#line 5404 "PhotoPage.c"
 }
 
 
@@ -5418,7 +5420,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	if (_tmp0_ < 0.03) {
 #line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5418 "PhotoPage.c"
+#line 5420 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_ = 0.0;
 #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5427,7 +5429,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 		if (_tmp1_ > 0.97) {
 #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5427 "PhotoPage.c"
+#line 5429 "PhotoPage.c"
 		}
 	}
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5436,7 +5438,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	result = _tmp2_;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5436 "PhotoPage.c"
+#line 5438 "PhotoPage.c"
 }
 
 
@@ -5460,7 +5462,7 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	result = _tmp3_;
 #line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5460 "PhotoPage.c"
+#line 5462 "PhotoPage.c"
 }
 
 
@@ -5505,7 +5507,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	if (_tmp0_) {
 #line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5505 "PhotoPage.c"
+#line 5507 "PhotoPage.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -5559,7 +5561,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5559 "PhotoPage.c"
+#line 5561 "PhotoPage.c"
 	}
 #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
@@ -5591,7 +5593,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	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 5591 "PhotoPage.c"
+#line 5593 "PhotoPage.c"
 }
 
 
@@ -5603,7 +5605,7 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #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 5603 "PhotoPage.c"
+#line 5605 "PhotoPage.c"
 }
 
 
@@ -5615,7 +5617,7 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #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 5615 "PhotoPage.c"
+#line 5617 "PhotoPage.c"
 }
 
 
@@ -5636,7 +5638,7 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
 #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 5636 "PhotoPage.c"
+#line 5638 "PhotoPage.c"
 }
 
 
@@ -5679,7 +5681,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	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 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5679 "PhotoPage.c"
+#line 5681 "PhotoPage.c"
 			default:
 			{
 #line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5688,13 +5690,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5688 "PhotoPage.c"
+#line 5690 "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 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5694 "PhotoPage.c"
+#line 5696 "PhotoPage.c"
 			default:
 			{
 #line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5703,13 +5705,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5703 "PhotoPage.c"
+#line 5705 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5709 "PhotoPage.c"
+#line 5711 "PhotoPage.c"
 			default:
 			{
 #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5718,13 +5720,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5718 "PhotoPage.c"
+#line 5720 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5724 "PhotoPage.c"
+#line 5726 "PhotoPage.c"
 			default:
 			{
 #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5733,7 +5735,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5733 "PhotoPage.c"
+#line 5735 "PhotoPage.c"
 			}
 		}
 	}
@@ -5741,7 +5743,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	result = FALSE;
 #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5741 "PhotoPage.c"
+#line 5743 "PhotoPage.c"
 }
 
 
@@ -5750,7 +5752,7 @@ gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkE
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5750 "PhotoPage.c"
+#line 5752 "PhotoPage.c"
 }
 
 
@@ -5763,7 +5765,7 @@ static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #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 5763 "PhotoPage.c"
+#line 5765 "PhotoPage.c"
 }
 
 
@@ -5772,7 +5774,7 @@ void editing_host_page_on_increase_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5772 "PhotoPage.c"
+#line 5774 "PhotoPage.c"
 }
 
 
@@ -5785,7 +5787,7 @@ static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #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 5785 "PhotoPage.c"
+#line 5787 "PhotoPage.c"
 }
 
 
@@ -5794,7 +5796,7 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5794 "PhotoPage.c"
+#line 5796 "PhotoPage.c"
 }
 
 
@@ -5812,7 +5814,7 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
 #line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5812 "PhotoPage.c"
+#line 5814 "PhotoPage.c"
 }
 
 
@@ -5831,7 +5833,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	result = _tmp1_;
 #line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5831 "PhotoPage.c"
+#line 5833 "PhotoPage.c"
 }
 
 
@@ -5854,7 +5856,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	if (_tmp2_) {
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5854 "PhotoPage.c"
+#line 5856 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -5864,7 +5866,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5864 "PhotoPage.c"
+#line 5866 "PhotoPage.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5872,7 +5874,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		result = FALSE;
 #line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5872 "PhotoPage.c"
+#line 5874 "PhotoPage.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5882,7 +5884,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	result = FALSE;
 #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5882 "PhotoPage.c"
+#line 5884 "PhotoPage.c"
 }
 
 
@@ -5905,7 +5907,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	if (_tmp2_) {
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5905 "PhotoPage.c"
+#line 5907 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -5915,7 +5917,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5915 "PhotoPage.c"
+#line 5917 "PhotoPage.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5923,7 +5925,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		result = FALSE;
 #line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5923 "PhotoPage.c"
+#line 5925 "PhotoPage.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5933,7 +5935,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	result = FALSE;
 #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5933 "PhotoPage.c"
+#line 5935 "PhotoPage.c"
 }
 
 
@@ -5964,7 +5966,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	_tmp4_ = self->priv->zoom_slider;
 #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 5964 "PhotoPage.c"
+#line 5966 "PhotoPage.c"
 }
 
 
@@ -5977,7 +5979,7 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
 	result = TRUE;
 #line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5977 "PhotoPage.c"
+#line 5979 "PhotoPage.c"
 }
 
 
@@ -5997,7 +5999,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	_tmp1_ = container;
 #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 5997 "PhotoPage.c"
+#line 5999 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_ = NULL;
 #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6005,7 +6007,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6005 "PhotoPage.c"
+#line 6007 "PhotoPage.c"
 	}
 }
 
@@ -6024,7 +6026,7 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	result = _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6024 "PhotoPage.c"
+#line 6026 "PhotoPage.c"
 }
 
 
@@ -6047,7 +6049,7 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	result = _tmp2_;
 #line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6047 "PhotoPage.c"
+#line 6049 "PhotoPage.c"
 }
 
 
@@ -6084,7 +6086,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 		result = NULL;
 #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6084 "PhotoPage.c"
+#line 6086 "PhotoPage.c"
 	}
 #line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6116,7 +6118,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	result = _tmp12_;
 #line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6116 "PhotoPage.c"
+#line 6118 "PhotoPage.c"
 }
 
 
@@ -6134,7 +6136,7 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
 #line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6134 "PhotoPage.c"
+#line 6136 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -6152,13 +6154,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 		editing_host_page_set_photo_missing (self, !_tmp5_);
 #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6152 "PhotoPage.c"
+#line 6154 "PhotoPage.c"
 	}
 #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
 #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6158 "PhotoPage.c"
+#line 6160 "PhotoPage.c"
 }
 
 
@@ -6167,7 +6169,7 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo)
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6167 "PhotoPage.c"
+#line 6169 "PhotoPage.c"
 }
 
 
@@ -6272,7 +6274,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	_tmp21_ = self->priv->parent_view;
 #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6272 "PhotoPage.c"
+#line 6274 "PhotoPage.c"
 		ViewCollection* _tmp22_ = NULL;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_ = NULL;
@@ -6295,7 +6297,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 		_tmp26_ = view_in_parent;
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6295 "PhotoPage.c"
+#line 6297 "PhotoPage.c"
 			ViewCollection* _tmp27_ = NULL;
 			ViewCollection* _tmp28_ = NULL;
 			DataView* _tmp29_ = NULL;
@@ -6315,17 +6317,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 			view_collection_select_marked (_tmp27_, _tmp31_);
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6315 "PhotoPage.c"
+#line 6317 "PhotoPage.c"
 		}
 #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6319 "PhotoPage.c"
+#line 6321 "PhotoPage.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6325 "PhotoPage.c"
+#line 6327 "PhotoPage.c"
 }
 
 
@@ -6337,7 +6339,7 @@ static void editing_host_page_real_realize (GtkWidget* base) {
 	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 6337 "PhotoPage.c"
+#line 6339 "PhotoPage.c"
 }
 
 
@@ -6355,21 +6357,21 @@ static void editing_host_page_real_switched_to (Page* base) {
 	_tmp1_ = editing_host_page_has_photo (self);
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6355 "PhotoPage.c"
+#line 6357 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6361 "PhotoPage.c"
+#line 6363 "PhotoPage.c"
 	} else {
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6365 "PhotoPage.c"
+#line 6367 "PhotoPage.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6369 "PhotoPage.c"
+#line 6371 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6380,7 +6382,7 @@ static void editing_host_page_real_switched_to (Page* base) {
 		editing_host_page_replace_photo (self, _tmp4_);
 #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6380 "PhotoPage.c"
+#line 6382 "PhotoPage.c"
 	}
 }
 
@@ -6408,21 +6410,21 @@ static void editing_host_page_real_switching_from (Page* base) {
 	_tmp2_ = editing_host_page_has_photo (self);
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6408 "PhotoPage.c"
+#line 6410 "PhotoPage.c"
 		ViewCollection* _tmp3_ = NULL;
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6414 "PhotoPage.c"
+#line 6416 "PhotoPage.c"
 	} else {
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6418 "PhotoPage.c"
+#line 6420 "PhotoPage.c"
 	}
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6422 "PhotoPage.c"
+#line 6424 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6458,7 +6460,7 @@ static void editing_host_page_real_switching_from (Page* base) {
 		_g_object_unref0 (_tmp10_);
 #line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6458 "PhotoPage.c"
+#line 6460 "PhotoPage.c"
 	}
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
@@ -6472,14 +6474,14 @@ static void editing_host_page_real_switching_from (Page* base) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
 #line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6472 "PhotoPage.c"
+#line 6474 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6479 "PhotoPage.c"
+#line 6481 "PhotoPage.c"
 }
 
 
@@ -6517,7 +6519,7 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	_tmp4_ = page;
 #line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6517 "PhotoPage.c"
+#line 6519 "PhotoPage.c"
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -6531,11 +6533,11 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
 #line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6531 "PhotoPage.c"
+#line 6533 "PhotoPage.c"
 	}
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6535 "PhotoPage.c"
+#line 6537 "PhotoPage.c"
 }
 
 
@@ -6566,7 +6568,7 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	_tmp3_ = page;
 #line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6566 "PhotoPage.c"
+#line 6568 "PhotoPage.c"
 		Page* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6583,11 +6585,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 		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 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6583 "PhotoPage.c"
+#line 6585 "PhotoPage.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6587 "PhotoPage.c"
+#line 6589 "PhotoPage.c"
 }
 
 
@@ -6596,7 +6598,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6596 "PhotoPage.c"
+#line 6598 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
@@ -6609,7 +6611,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 		_view_it = _tmp1_;
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6609 "PhotoPage.c"
+#line 6611 "PhotoPage.c"
 			gboolean _tmp2_ = FALSE;
 			DataView* view = NULL;
 			gpointer _tmp3_ = NULL;
@@ -6622,7 +6624,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			if (!_tmp2_) {
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6622 "PhotoPage.c"
+#line 6624 "PhotoPage.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
@@ -6642,11 +6644,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			_g_object_unref0 (view);
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6642 "PhotoPage.c"
+#line 6644 "PhotoPage.c"
 		}
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6646 "PhotoPage.c"
+#line 6648 "PhotoPage.c"
 	}
 }
 
@@ -6662,14 +6664,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena
 	_tmp1_ = should_enable;
 #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 6662 "PhotoPage.c"
+#line 6664 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
 #line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6669 "PhotoPage.c"
+#line 6671 "PhotoPage.c"
 }
 
 
@@ -6678,7 +6680,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6678 "PhotoPage.c"
+#line 6680 "PhotoPage.c"
 }
 
 
@@ -6711,7 +6713,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp2_ = self->priv->cache;
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6711 "PhotoPage.c"
+#line 6713 "PhotoPage.c"
 		PixbufCache* _tmp3_ = NULL;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_ = {0};
@@ -6726,17 +6728,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6726 "PhotoPage.c"
+#line 6728 "PhotoPage.c"
 	} else {
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6730 "PhotoPage.c"
+#line 6732 "PhotoPage.c"
 	}
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
 #line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6736 "PhotoPage.c"
+#line 6738 "PhotoPage.c"
 	}
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
@@ -6752,7 +6754,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp10_ = self->priv->cache;
 #line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6752 "PhotoPage.c"
+#line 6754 "PhotoPage.c"
 		PixbufCache* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		PixbufCache* _tmp13_ = NULL;
@@ -6766,7 +6768,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp13_ = self->priv->cache;
 #line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6766 "PhotoPage.c"
+#line 6768 "PhotoPage.c"
 	}
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
@@ -6796,7 +6798,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp21_ = caller;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6796 "PhotoPage.c"
+#line 6798 "PhotoPage.c"
 }
 
 
@@ -6810,7 +6812,7 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6810 "PhotoPage.c"
+#line 6812 "PhotoPage.c"
 		const gchar* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -6851,14 +6853,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6850 "PhotoPage.c"
+#line 6852 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
 #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
 #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_debug ("PhotoPage.vala:943: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6857 "PhotoPage.c"
+#line 6859 "PhotoPage.c"
 	}
 }
 
@@ -6880,7 +6882,7 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	if (_tmp2_) {
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6879 "PhotoPage.c"
+#line 6881 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -6890,13 +6892,13 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 		_tmp4_ = photo_has_editable (_tmp3_);
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6889 "PhotoPage.c"
+#line 6891 "PhotoPage.c"
 	}
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6895 "PhotoPage.c"
+#line 6897 "PhotoPage.c"
 }
 
 
@@ -6930,13 +6932,13 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	if (_tmp4_) {
 #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6929 "PhotoPage.c"
+#line 6931 "PhotoPage.c"
 	}
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6935 "PhotoPage.c"
+#line 6937 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_ = NULL;
 		Dimensions max_dim = {0};
@@ -6950,7 +6952,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp7_ = self->priv->zoom_buffer;
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6949 "PhotoPage.c"
+#line 6951 "PhotoPage.c"
 			ZoomBuffer* _tmp8_ = NULL;
 			Photo* _tmp9_ = NULL;
 			Photo* _tmp10_ = NULL;
@@ -6967,15 +6969,15 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp6_ = _tmp10_ == _tmp11_;
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6966 "PhotoPage.c"
+#line 6968 "PhotoPage.c"
 		} else {
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6970 "PhotoPage.c"
+#line 6972 "PhotoPage.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6974 "PhotoPage.c"
+#line 6976 "PhotoPage.c"
 			Photo* _tmp12_ = NULL;
 			GdkPixbuf* _tmp13_ = NULL;
 			ZoomBuffer* _tmp14_ = NULL;
@@ -6989,7 +6991,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_g_object_unref0 (self->priv->zoom_buffer);
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 6988 "PhotoPage.c"
+#line 6990 "PhotoPage.c"
 		}
 #line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
@@ -7001,7 +7003,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp17_ = self->priv->current_tool;
 #line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7000 "PhotoPage.c"
+#line 7002 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7025,14 +7027,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				tool_pixbuf = _tmp22_;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7024 "PhotoPage.c"
-					goto __catch241_g_error;
+#line 7026 "PhotoPage.c"
+					goto __catch243_g_error;
 				}
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7031 "PhotoPage.c"
+#line 7033 "PhotoPage.c"
 					GdkPixbuf* _tmp24_ = NULL;
 					Dimensions _tmp25_ = {0};
 #line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7043,14 +7045,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 					_tmp25_ = tool_pixbuf_dim;
 #line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7042 "PhotoPage.c"
+#line 7044 "PhotoPage.c"
 				}
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7046 "PhotoPage.c"
+#line 7048 "PhotoPage.c"
 			}
-			goto __finally241;
-			__catch241_g_error:
+			goto __finally243;
+			__catch243_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_ = NULL;
@@ -7082,9 +7084,9 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				_g_error_free0 (err);
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7081 "PhotoPage.c"
+#line 7083 "PhotoPage.c"
 			}
-			__finally241:
+			__finally243:
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7093,7 +7095,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				g_clear_error (&_inner_error_);
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7092 "PhotoPage.c"
+#line 7094 "PhotoPage.c"
 			}
 		}
 #line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7108,14 +7110,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp33_ = photo;
 #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 7107 "PhotoPage.c"
+#line 7109 "PhotoPage.c"
 	} else {
 		GError* _tmp34_ = NULL;
 #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
 #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7114 "PhotoPage.c"
+#line 7116 "PhotoPage.c"
 			Photo* _tmp35_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
@@ -7123,7 +7125,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp35_ = photo;
 #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 7122 "PhotoPage.c"
+#line 7124 "PhotoPage.c"
 		}
 	}
 }
@@ -7207,7 +7209,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_g_object_unref0 (normal_batch);
 #line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7206 "PhotoPage.c"
+#line 7208 "PhotoPage.c"
 	}
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
@@ -7221,7 +7223,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7220 "PhotoPage.c"
+#line 7222 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_ = NULL;
@@ -7248,7 +7250,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_neighbor_source_it = _tmp20_;
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7247 "PhotoPage.c"
+#line 7249 "PhotoPage.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			DataSource* neighbor_source = NULL;
@@ -7275,7 +7277,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (!_tmp22_) {
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7274 "PhotoPage.c"
+#line 7276 "PhotoPage.c"
 			}
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
@@ -7301,7 +7303,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (_tmp30_) {
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7300 "PhotoPage.c"
+#line 7302 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
@@ -7314,13 +7316,13 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 				_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 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7313 "PhotoPage.c"
+#line 7315 "PhotoPage.c"
 			}
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
 #line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7319 "PhotoPage.c"
+#line 7321 "PhotoPage.c"
 			}
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
@@ -7340,11 +7342,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			_g_object_unref0 (neighbor);
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7339 "PhotoPage.c"
+#line 7341 "PhotoPage.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7343 "PhotoPage.c"
+#line 7345 "PhotoPage.c"
 	}
 #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
@@ -7370,7 +7372,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_g_object_unref0 (master_batch);
 #line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7369 "PhotoPage.c"
+#line 7371 "PhotoPage.c"
 }
 
 
@@ -7413,7 +7415,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7412 "PhotoPage.c"
+#line 7414 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_ = NULL;
@@ -7426,7 +7428,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_old_neighbor_it = _tmp7_;
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7425 "PhotoPage.c"
+#line 7427 "PhotoPage.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Photo* old_neighbor = NULL;
@@ -7444,7 +7446,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			if (!_tmp9_) {
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7443 "PhotoPage.c"
+#line 7445 "PhotoPage.c"
 			}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
@@ -7460,7 +7462,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7459 "PhotoPage.c"
+#line 7461 "PhotoPage.c"
 				Photo* _tmp16_ = NULL;
 				Photo* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
@@ -7472,15 +7474,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_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 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7471 "PhotoPage.c"
+#line 7473 "PhotoPage.c"
 			} else {
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7475 "PhotoPage.c"
+#line 7477 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7479 "PhotoPage.c"
+#line 7481 "PhotoPage.c"
 				PixbufCache* _tmp19_ = NULL;
 				Photo* _tmp20_ = NULL;
 				PixbufCache* _tmp21_ = NULL;
@@ -7497,15 +7499,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp22_ = old_neighbor;
 #line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7496 "PhotoPage.c"
+#line 7498 "PhotoPage.c"
 			}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7500 "PhotoPage.c"
+#line 7502 "PhotoPage.c"
 		}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7504 "PhotoPage.c"
+#line 7506 "PhotoPage.c"
 	}
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
@@ -7515,7 +7517,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7514 "PhotoPage.c"
+#line 7516 "PhotoPage.c"
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
@@ -7527,15 +7529,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_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 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7526 "PhotoPage.c"
+#line 7528 "PhotoPage.c"
 	} else {
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7530 "PhotoPage.c"
+#line 7532 "PhotoPage.c"
 	}
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7534 "PhotoPage.c"
+#line 7536 "PhotoPage.c"
 		PixbufCache* _tmp30_ = NULL;
 		Photo* _tmp31_ = NULL;
 		PixbufCache* _tmp32_ = NULL;
@@ -7552,13 +7554,13 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp33_ = old_photo;
 #line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7551 "PhotoPage.c"
+#line 7553 "PhotoPage.c"
 	}
 #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
 #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7557 "PhotoPage.c"
+#line 7559 "PhotoPage.c"
 }
 
 
@@ -7576,7 +7578,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7575 "PhotoPage.c"
+#line 7577 "PhotoPage.c"
 }
 
 
@@ -7585,7 +7587,7 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7584 "PhotoPage.c"
+#line 7586 "PhotoPage.c"
 }
 
 
@@ -7602,7 +7604,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
 #line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7601 "PhotoPage.c"
+#line 7603 "PhotoPage.c"
 }
 
 
@@ -7611,7 +7613,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
 #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7610 "PhotoPage.c"
+#line 7612 "PhotoPage.c"
 }
 
 
@@ -7620,7 +7622,7 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
 #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7619 "PhotoPage.c"
+#line 7621 "PhotoPage.c"
 }
 
 
@@ -7665,7 +7667,7 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	_data_collection_unref0 (_tmp7_);
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7664 "PhotoPage.c"
+#line 7666 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7674,15 +7676,15 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_tmp10_ = self->priv->parent_view;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7673 "PhotoPage.c"
+#line 7675 "PhotoPage.c"
 	} else {
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7677 "PhotoPage.c"
+#line 7679 "PhotoPage.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7681 "PhotoPage.c"
+#line 7683 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7716,13 +7718,13 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7715 "PhotoPage.c"
+#line 7717 "PhotoPage.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7721 "PhotoPage.c"
+#line 7723 "PhotoPage.c"
 }
 
 
@@ -7767,7 +7769,7 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	_data_collection_unref0 (_tmp7_);
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7766 "PhotoPage.c"
+#line 7768 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7776,15 +7778,15 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_tmp10_ = self->priv->parent_view;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7775 "PhotoPage.c"
+#line 7777 "PhotoPage.c"
 	} else {
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7779 "PhotoPage.c"
+#line 7781 "PhotoPage.c"
 	}
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7783 "PhotoPage.c"
+#line 7785 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7818,13 +7820,13 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7817 "PhotoPage.c"
+#line 7819 "PhotoPage.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7823 "PhotoPage.c"
+#line 7825 "PhotoPage.c"
 }
 
 
@@ -7875,7 +7877,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	dimensions_init (&_tmp8_, 0, 0);
 #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7874 "PhotoPage.c"
+#line 7876 "PhotoPage.c"
 }
 
 
@@ -7884,14 +7886,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7883 "PhotoPage.c"
+#line 7885 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
 #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7890 "PhotoPage.c"
+#line 7892 "PhotoPage.c"
 }
 
 
@@ -7900,7 +7902,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7899 "PhotoPage.c"
+#line 7901 "PhotoPage.c"
 }
 
 
@@ -7964,17 +7966,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp10_ = x;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7963 "PhotoPage.c"
+#line 7965 "PhotoPage.c"
 		gint _tmp11_ = 0;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7969 "PhotoPage.c"
+#line 7971 "PhotoPage.c"
 	} else {
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7973 "PhotoPage.c"
+#line 7975 "PhotoPage.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
@@ -7990,17 +7992,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp16_ = y;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 7989 "PhotoPage.c"
+#line 7991 "PhotoPage.c"
 		gint _tmp17_ = 0;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 7995 "PhotoPage.c"
+#line 7997 "PhotoPage.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 7999 "PhotoPage.c"
+#line 8001 "PhotoPage.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
@@ -8014,7 +8016,7 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8013 "PhotoPage.c"
+#line 8015 "PhotoPage.c"
 }
 
 
@@ -8038,7 +8040,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	if (_tmp0_ == _tmp1_) {
 #line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8037 "PhotoPage.c"
+#line 8039 "PhotoPage.c"
 	}
 #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
@@ -8056,7 +8058,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 		_g_object_unref0 (photo);
 #line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8055 "PhotoPage.c"
+#line 8057 "PhotoPage.c"
 	}
 #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
@@ -8066,7 +8068,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	_tmp6_ = self->priv->photo_missing;
 #line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8065 "PhotoPage.c"
+#line 8067 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_ = NULL;
@@ -8091,8 +8093,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			pixbuf = _tmp9_;
 #line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8090 "PhotoPage.c"
-				goto __catch242_g_error;
+#line 8092 "PhotoPage.c"
+				goto __catch244_g_error;
 			}
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
@@ -8120,10 +8122,10 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8119 "PhotoPage.c"
+#line 8121 "PhotoPage.c"
 		}
-		goto __finally242;
-		__catch242_g_error:
+		goto __finally244;
+		__catch244_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -8156,9 +8158,9 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_warning ("PhotoPage.vala:1142: %s", _tmp24_);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8155 "PhotoPage.c"
+#line 8157 "PhotoPage.c"
 		}
-		__finally242:
+		__finally244:
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8169,12 +8171,12 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_clear_error (&_inner_error_);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8168 "PhotoPage.c"
+#line 8170 "PhotoPage.c"
 		}
 	}
 #line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8173 "PhotoPage.c"
+#line 8175 "PhotoPage.c"
 }
 
 
@@ -8189,7 +8191,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	result = _tmp0_;
 #line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8188 "PhotoPage.c"
+#line 8190 "PhotoPage.c"
 }
 
 
@@ -8203,7 +8205,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
 	result = TRUE;
 #line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8202 "PhotoPage.c"
+#line 8204 "PhotoPage.c"
 }
 
 
@@ -8212,7 +8214,7 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo*
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #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 8211 "PhotoPage.c"
+#line 8213 "PhotoPage.c"
 }
 
 
@@ -8241,7 +8243,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	_tmp3_ = pixbuf;
 #line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8240 "PhotoPage.c"
+#line 8242 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_ = NULL;
@@ -8258,8 +8260,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_tmp4_ = _tmp7_;
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8257 "PhotoPage.c"
-				goto __catch243_g_error;
+#line 8259 "PhotoPage.c"
+				goto __catch245_g_error;
 			}
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
@@ -8271,10 +8273,10 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			pixbuf = _tmp8_;
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8270 "PhotoPage.c"
+#line 8272 "PhotoPage.c"
 		}
-		goto __finally243;
-		__catch243_g_error:
+		goto __finally245;
+		__catch245_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_ = NULL;
@@ -8291,9 +8293,9 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_warning ("PhotoPage.vala:1161: %s", _tmp10_);
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8290 "PhotoPage.c"
+#line 8292 "PhotoPage.c"
 		}
-		__finally243:
+		__finally245:
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8304,14 +8306,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_clear_error (&_inner_error_);
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8303 "PhotoPage.c"
+#line 8305 "PhotoPage.c"
 		}
 	}
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8310 "PhotoPage.c"
+#line 8312 "PhotoPage.c"
 		GdkPixbuf* _tmp12_ = NULL;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_ = NULL;
@@ -8333,13 +8335,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 		_tmp16_ = _tmp15_;
 #line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8332 "PhotoPage.c"
+#line 8334 "PhotoPage.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8338 "PhotoPage.c"
+#line 8340 "PhotoPage.c"
 }
 
 
@@ -8389,35 +8391,35 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_g_object_unref0 (_tmp4_);
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8388 "PhotoPage.c"
+#line 8390 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8394 "PhotoPage.c"
+#line 8396 "PhotoPage.c"
 	} else {
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8398 "PhotoPage.c"
+#line 8400 "PhotoPage.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8402 "PhotoPage.c"
+#line 8404 "PhotoPage.c"
 		gboolean _tmp8_ = FALSE;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8408 "PhotoPage.c"
+#line 8410 "PhotoPage.c"
 	} else {
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8412 "PhotoPage.c"
+#line 8414 "PhotoPage.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8416 "PhotoPage.c"
+#line 8418 "PhotoPage.c"
 		Photo* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
@@ -8441,13 +8443,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_g_object_unref0 (_tmp12_);
 #line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8440 "PhotoPage.c"
+#line 8442 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8446 "PhotoPage.c"
+#line 8448 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
 		Photo* _tmp19_ = NULL;
@@ -8464,25 +8466,25 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_tmp15_ = !_tmp20_;
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8463 "PhotoPage.c"
+#line 8465 "PhotoPage.c"
 	} else {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8467 "PhotoPage.c"
+#line 8469 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8473 "PhotoPage.c"
+#line 8475 "PhotoPage.c"
 	} else {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8477 "PhotoPage.c"
+#line 8479 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8481 "PhotoPage.c"
+#line 8483 "PhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		Photo* _tmp23_ = NULL;
@@ -8504,7 +8506,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		if (_tmp25_) {
 #line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8503 "PhotoPage.c"
+#line 8505 "PhotoPage.c"
 		}
 	}
 #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8553,7 +8555,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_tmp36_ = old_photo;
 #line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8552 "PhotoPage.c"
+#line 8554 "PhotoPage.c"
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
 		Photo* _tmp39_ = NULL;
@@ -8578,7 +8580,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_data_collection_unref0 (_tmp41_);
 #line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8577 "PhotoPage.c"
+#line 8579 "PhotoPage.c"
 	}
 #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));
@@ -8604,7 +8606,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	editing_host_page_refresh_caches (self, "replace_photo");
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8603 "PhotoPage.c"
+#line 8605 "PhotoPage.c"
 }
 
 
@@ -8647,7 +8649,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	_g_object_unref0 (_tmp5_);
 #line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8646 "PhotoPage.c"
+#line 8648 "PhotoPage.c"
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -8667,13 +8669,13 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8666 "PhotoPage.c"
+#line 8668 "PhotoPage.c"
 	}
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8672 "PhotoPage.c"
+#line 8674 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_ = NULL;
 		GdkWindow* _tmp15_ = NULL;
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8682,21 +8684,21 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8681 "PhotoPage.c"
+#line 8683 "PhotoPage.c"
 	} else {
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8685 "PhotoPage.c"
+#line 8687 "PhotoPage.c"
 	}
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
 #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 8691 "PhotoPage.c"
+#line 8693 "PhotoPage.c"
 	}
 #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 8695 "PhotoPage.c"
+#line 8697 "PhotoPage.c"
 }
 
 
@@ -8740,7 +8742,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_tmp5_ = pixbuf;
 #line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8739 "PhotoPage.c"
+#line 8741 "PhotoPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
@@ -8763,7 +8765,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (pixbuf);
 #line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8762 "PhotoPage.c"
+#line 8764 "PhotoPage.c"
 	}
 #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_);
@@ -8789,7 +8791,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_g_free0 (_tmp14_);
 #line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8788 "PhotoPage.c"
+#line 8790 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
@@ -8816,8 +8818,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_tmp17_ = _tmp22_;
 #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8815 "PhotoPage.c"
-			goto __catch244_g_error;
+#line 8817 "PhotoPage.c"
+			goto __catch246_g_error;
 		}
 #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
@@ -8831,10 +8833,10 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp24_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8830 "PhotoPage.c"
+#line 8832 "PhotoPage.c"
 	}
-	goto __finally244;
-	__catch244_g_error:
+	goto __finally246;
+	__catch246_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
@@ -8851,9 +8853,9 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_warning ("PhotoPage.vala:1256: %s", _tmp27_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8850 "PhotoPage.c"
+#line 8852 "PhotoPage.c"
 	}
-	__finally244:
+	__finally246:
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8864,7 +8866,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8863 "PhotoPage.c"
+#line 8865 "PhotoPage.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
@@ -8880,7 +8882,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = FALSE;
 #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8879 "PhotoPage.c"
+#line 8881 "PhotoPage.c"
 }
 
 
@@ -8913,7 +8915,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (photo);
 #line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8912 "PhotoPage.c"
+#line 8914 "PhotoPage.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
@@ -8923,7 +8925,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8922 "PhotoPage.c"
+#line 8924 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
@@ -8937,7 +8939,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_tmp5_ = self->priv->current_tool;
 #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8936 "PhotoPage.c"
+#line 8938 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_ = NULL;
 			Scaling _tmp8_ = {0};
@@ -8959,8 +8961,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp6_ = _tmp11_;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8958 "PhotoPage.c"
-				goto __catch245_g_error;
+#line 8960 "PhotoPage.c"
+				goto __catch247_g_error;
 			}
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
@@ -8972,23 +8974,23 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			pixbuf = _tmp12_;
 #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8971 "PhotoPage.c"
+#line 8973 "PhotoPage.c"
 		}
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8977 "PhotoPage.c"
+#line 8979 "PhotoPage.c"
 			Dimensions _tmp14_ = {0};
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 8983 "PhotoPage.c"
+#line 8985 "PhotoPage.c"
 		}
 	}
-	goto __finally245;
-	__catch245_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -9007,9 +9009,9 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9006 "PhotoPage.c"
+#line 9008 "PhotoPage.c"
 	}
-	__finally245:
+	__finally247:
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9022,20 +9024,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return FALSE;
-#line 9021 "PhotoPage.c"
+#line 9023 "PhotoPage.c"
 	}
 #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->photo_missing;
 #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp17_) {
-#line 9027 "PhotoPage.c"
+#line 9029 "PhotoPage.c"
 		GdkPixbuf* _tmp18_ = NULL;
 		GdkPixbuf* _tmp22_ = NULL;
 #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = pixbuf;
 #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp18_ == NULL) {
-#line 9034 "PhotoPage.c"
+#line 9036 "PhotoPage.c"
 			PixbufCache* _tmp19_ = NULL;
 			Photo* _tmp20_ = NULL;
 			GdkPixbuf* _tmp21_ = NULL;
@@ -9049,13 +9051,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_g_object_unref0 (pixbuf);
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp21_;
-#line 9048 "PhotoPage.c"
+#line 9050 "PhotoPage.c"
 		}
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = pixbuf;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp22_ == NULL) {
-#line 9054 "PhotoPage.c"
+#line 9056 "PhotoPage.c"
 			PixbufCache* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9064,28 +9066,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp24_ = photo;
 #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9063 "PhotoPage.c"
+#line 9065 "PhotoPage.c"
 		}
 	}
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->photo_missing;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 9070 "PhotoPage.c"
+#line 9072 "PhotoPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = pixbuf;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp27_ != NULL;
-#line 9076 "PhotoPage.c"
+#line 9078 "PhotoPage.c"
 	} else {
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = FALSE;
-#line 9080 "PhotoPage.c"
+#line 9082 "PhotoPage.c"
 	}
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp25_) {
-#line 9084 "PhotoPage.c"
+#line 9086 "PhotoPage.c"
 		GdkPixbuf* _tmp28_ = NULL;
 		Dimensions _tmp29_ = {0};
 #line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9096,7 +9098,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
 #line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9095 "PhotoPage.c"
+#line 9097 "PhotoPage.c"
 	}
 #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9106,7 +9108,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	_g_object_unref0 (photo);
 #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9105 "PhotoPage.c"
+#line 9107 "PhotoPage.c"
 }
 
 
@@ -9123,7 +9125,7 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	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 9122 "PhotoPage.c"
+#line 9124 "PhotoPage.c"
 }
 
 
@@ -9139,7 +9141,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
 	self->priv->pixbuf_dirty = TRUE;
 #line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9138 "PhotoPage.c"
+#line 9140 "PhotoPage.c"
 }
 
 
@@ -9152,7 +9154,7 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = TRUE;
 #line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9151 "PhotoPage.c"
+#line 9153 "PhotoPage.c"
 }
 
 
@@ -9236,21 +9238,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp13_ = photo;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9235 "PhotoPage.c"
+#line 9237 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9241 "PhotoPage.c"
+#line 9243 "PhotoPage.c"
 	} else {
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9245 "PhotoPage.c"
+#line 9247 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9249 "PhotoPage.c"
+#line 9251 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9259,15 +9261,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9258 "PhotoPage.c"
+#line 9260 "PhotoPage.c"
 	} else {
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9262 "PhotoPage.c"
+#line 9264 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9266 "PhotoPage.c"
+#line 9268 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9276,11 +9278,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9275 "PhotoPage.c"
+#line 9277 "PhotoPage.c"
 	} else {
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9279 "PhotoPage.c"
+#line 9281 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
@@ -9290,21 +9292,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp22_ = photo;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9289 "PhotoPage.c"
+#line 9291 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9295 "PhotoPage.c"
+#line 9297 "PhotoPage.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9299 "PhotoPage.c"
+#line 9301 "PhotoPage.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9303 "PhotoPage.c"
+#line 9305 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
@@ -9316,11 +9318,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9315 "PhotoPage.c"
+#line 9317 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9319 "PhotoPage.c"
+#line 9321 "PhotoPage.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
@@ -9330,21 +9332,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp30_ = photo;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9329 "PhotoPage.c"
+#line 9331 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9335 "PhotoPage.c"
+#line 9337 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9339 "PhotoPage.c"
+#line 9341 "PhotoPage.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9343 "PhotoPage.c"
+#line 9345 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
@@ -9356,11 +9358,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9355 "PhotoPage.c"
+#line 9357 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9359 "PhotoPage.c"
+#line 9361 "PhotoPage.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
@@ -9370,21 +9372,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp38_ = photo;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9369 "PhotoPage.c"
+#line 9371 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9375 "PhotoPage.c"
+#line 9377 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9379 "PhotoPage.c"
+#line 9381 "PhotoPage.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9383 "PhotoPage.c"
+#line 9385 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
@@ -9396,11 +9398,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9395 "PhotoPage.c"
+#line 9397 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9399 "PhotoPage.c"
+#line 9401 "PhotoPage.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
@@ -9410,21 +9412,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp46_ = photo;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9409 "PhotoPage.c"
+#line 9411 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9415 "PhotoPage.c"
+#line 9417 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9419 "PhotoPage.c"
+#line 9421 "PhotoPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9423 "PhotoPage.c"
+#line 9425 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9433,11 +9435,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9432 "PhotoPage.c"
+#line 9434 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9436 "PhotoPage.c"
+#line 9438 "PhotoPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
@@ -9447,21 +9449,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp53_ = photo;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9446 "PhotoPage.c"
+#line 9448 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9452 "PhotoPage.c"
+#line 9454 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9456 "PhotoPage.c"
+#line 9458 "PhotoPage.c"
 	}
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9460 "PhotoPage.c"
+#line 9462 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
@@ -9473,11 +9475,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9472 "PhotoPage.c"
+#line 9474 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9476 "PhotoPage.c"
+#line 9478 "PhotoPage.c"
 	}
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
@@ -9491,7 +9493,7 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	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 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9490 "PhotoPage.c"
+#line 9492 "PhotoPage.c"
 }
 
 
@@ -9510,51 +9512,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	_tmp3_ = self->priv->current_tool;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9509 "PhotoPage.c"
+#line 9511 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9515 "PhotoPage.c"
+#line 9517 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9519 "PhotoPage.c"
+#line 9521 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9523 "PhotoPage.c"
+#line 9525 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9529 "PhotoPage.c"
+#line 9531 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9533 "PhotoPage.c"
+#line 9535 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9537 "PhotoPage.c"
+#line 9539 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9543 "PhotoPage.c"
+#line 9545 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9547 "PhotoPage.c"
+#line 9549 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9553 "PhotoPage.c"
+#line 9555 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -9564,7 +9566,7 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	result = _tmp8_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9563 "PhotoPage.c"
+#line 9565 "PhotoPage.c"
 }
 
 
@@ -9582,7 +9584,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	if (_tmp0_ == NULL) {
 #line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9581 "PhotoPage.c"
+#line 9583 "PhotoPage.c"
 	}
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9592,7 +9594,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	result = _tmp2_;
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9591 "PhotoPage.c"
+#line 9593 "PhotoPage.c"
 }
 
 
@@ -9610,7 +9612,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	if (_tmp0_ == NULL) {
 #line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9609 "PhotoPage.c"
+#line 9611 "PhotoPage.c"
 	}
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9620,7 +9622,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	result = _tmp2_;
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9619 "PhotoPage.c"
+#line 9621 "PhotoPage.c"
 }
 
 
@@ -9638,37 +9640,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	_tmp2_ = self->priv->current_tool;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9637 "PhotoPage.c"
+#line 9639 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9643 "PhotoPage.c"
+#line 9645 "PhotoPage.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9647 "PhotoPage.c"
+#line 9649 "PhotoPage.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9651 "PhotoPage.c"
+#line 9653 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9657 "PhotoPage.c"
+#line 9659 "PhotoPage.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9661 "PhotoPage.c"
+#line 9663 "PhotoPage.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9667 "PhotoPage.c"
+#line 9669 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -9678,7 +9680,7 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	result = _tmp6_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9677 "PhotoPage.c"
+#line 9679 "PhotoPage.c"
 }
 
 
@@ -9694,7 +9696,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	GError * _inner_error_ = NULL;
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9693 "PhotoPage.c"
+#line 9695 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9719,8 +9721,8 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_tmp0_ = _tmp4_;
 #line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9718 "PhotoPage.c"
-			goto __catch246_g_error;
+#line 9720 "PhotoPage.c"
+			goto __catch248_g_error;
 		}
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
@@ -9738,10 +9740,10 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9737 "PhotoPage.c"
+#line 9739 "PhotoPage.c"
 	}
-	goto __finally246;
-	__catch246_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9754,9 +9756,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (original);
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9753 "PhotoPage.c"
+#line 9755 "PhotoPage.c"
 	}
-	__finally246:
+	__finally248:
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9767,7 +9769,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9766 "PhotoPage.c"
+#line 9768 "PhotoPage.c"
 	}
 #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));
@@ -9785,7 +9787,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #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 9784 "PhotoPage.c"
+#line 9786 "PhotoPage.c"
 	}
 #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
@@ -9801,7 +9803,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	_g_object_unref0 (_tmp14_);
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9800 "PhotoPage.c"
+#line 9802 "PhotoPage.c"
 }
 
 
@@ -9813,7 +9815,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	_tmp0_ = self->priv->swapped;
 #line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9812 "PhotoPage.c"
+#line 9814 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -9838,7 +9840,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 		_g_object_unref0 (self->priv->swapped);
 #line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9837 "PhotoPage.c"
+#line 9839 "PhotoPage.c"
 	}
 }
 
@@ -9846,7 +9848,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9845 "PhotoPage.c"
+#line 9847 "PhotoPage.c"
 }
 
 
@@ -9897,7 +9899,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_g_object_unref0 (_tmp3_);
 #line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9896 "PhotoPage.c"
+#line 9898 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9935,8 +9937,8 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp7_ = _tmp14_;
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9934 "PhotoPage.c"
-			goto __catch247_g_error;
+#line 9936 "PhotoPage.c"
+			goto __catch249_g_error;
 		}
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
@@ -9950,20 +9952,20 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp16_ = unscaled;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9949 "PhotoPage.c"
+#line 9951 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9955 "PhotoPage.c"
+#line 9957 "PhotoPage.c"
 		}
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9959 "PhotoPage.c"
+#line 9961 "PhotoPage.c"
 	}
-	goto __finally247;
-	__catch247_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -9996,9 +9998,9 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_g_object_unref0 (unscaled);
 #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9995 "PhotoPage.c"
+#line 9997 "PhotoPage.c"
 	}
-	__finally247:
+	__finally249:
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10009,13 +10011,13 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		g_clear_error (&_inner_error_);
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10008 "PhotoPage.c"
+#line 10010 "PhotoPage.c"
 	}
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10014 "PhotoPage.c"
+#line 10016 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
 #line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10024,7 +10026,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp24_ = max_dim;
 #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 10023 "PhotoPage.c"
+#line 10025 "PhotoPage.c"
 	}
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10052,42 +10054,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
 #line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10051 "PhotoPage.c"
+#line 10053 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10058 "PhotoPage.c"
+#line 10060 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10065 "PhotoPage.c"
+#line 10067 "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 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 10072 "PhotoPage.c"
+#line 10074 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10079 "PhotoPage.c"
+#line 10081 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10086 "PhotoPage.c"
+#line 10088 "PhotoPage.c"
 }
 
 
@@ -10096,7 +10098,7 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
 #line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10095 "PhotoPage.c"
+#line 10097 "PhotoPage.c"
 }
 
 
@@ -10140,7 +10142,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	if (_tmp0_ == NULL) {
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10139 "PhotoPage.c"
+#line 10141 "PhotoPage.c"
 	}
 #line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10162,7 +10164,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp6_ = tool_window;
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10161 "PhotoPage.c"
+#line 10163 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10171,15 +10173,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10170 "PhotoPage.c"
+#line 10172 "PhotoPage.c"
 	} else {
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10174 "PhotoPage.c"
+#line 10176 "PhotoPage.c"
 	}
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10178 "PhotoPage.c"
+#line 10180 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10237,7 +10239,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
 #line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10236 "PhotoPage.c"
+#line 10238 "PhotoPage.c"
 	}
 #line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
@@ -10287,7 +10289,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp35_ = new_pixbuf;
 #line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10286 "PhotoPage.c"
+#line 10288 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
 #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10298,14 +10300,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_g_object_unref0 (replacement);
 #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10297 "PhotoPage.c"
+#line 10299 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
 #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
 #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10304 "PhotoPage.c"
+#line 10306 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
@@ -10326,18 +10328,18 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 			*new_max_dim = _tmp42_;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10325 "PhotoPage.c"
+#line 10327 "PhotoPage.c"
 		} else {
 #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10329 "PhotoPage.c"
+#line 10331 "PhotoPage.c"
 		}
 	}
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10336 "PhotoPage.c"
+#line 10338 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
 #line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10346,7 +10348,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp45_ = *new_max_dim;
 #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 10345 "PhotoPage.c"
+#line 10347 "PhotoPage.c"
 	}
 #line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10360,13 +10362,13 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		self->priv->pixbuf_dirty = TRUE;
 #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 10359 "PhotoPage.c"
+#line 10361 "PhotoPage.c"
 	}
 #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
 #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10365 "PhotoPage.c"
+#line 10367 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
@@ -10380,7 +10382,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		command_manager_execute (_tmp49_, _tmp50_);
 #line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10379 "PhotoPage.c"
+#line 10381 "PhotoPage.c"
 	}
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10388,7 +10390,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_g_object_unref0 (tool_window);
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10387 "PhotoPage.c"
+#line 10389 "PhotoPage.c"
 }
 
 
@@ -10400,7 +10402,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
 	result = FALSE;
 #line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10399 "PhotoPage.c"
+#line 10401 "PhotoPage.c"
 }
 
 
@@ -10409,7 +10411,7 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10408 "PhotoPage.c"
+#line 10410 "PhotoPage.c"
 }
 
 
@@ -10443,14 +10445,14 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp1_ = _tmp0_->type;
 #line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10442 "PhotoPage.c"
+#line 10444 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10449 "PhotoPage.c"
+#line 10451 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10459,17 +10461,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10458 "PhotoPage.c"
+#line 10460 "PhotoPage.c"
 		} else {
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10462 "PhotoPage.c"
+#line 10464 "PhotoPage.c"
 		}
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10468 "PhotoPage.c"
+#line 10470 "PhotoPage.c"
 	}
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
@@ -10487,7 +10489,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp11_ = self->priv->current_tool;
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10486 "PhotoPage.c"
+#line 10488 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10496,15 +10498,15 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10495 "PhotoPage.c"
+#line 10497 "PhotoPage.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10499 "PhotoPage.c"
+#line 10501 "PhotoPage.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10503 "PhotoPage.c"
+#line 10505 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
@@ -10529,7 +10531,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10528 "PhotoPage.c"
+#line 10530 "PhotoPage.c"
 	}
 #line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
@@ -10539,7 +10541,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = FALSE;
 #line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10538 "PhotoPage.c"
+#line 10540 "PhotoPage.c"
 	}
 #line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
@@ -10553,7 +10555,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10552 "PhotoPage.c"
+#line 10554 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10567,7 +10569,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	result = TRUE;
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10566 "PhotoPage.c"
+#line 10568 "PhotoPage.c"
 }
 
 
@@ -10593,7 +10595,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_tmp0_ = self->priv->is_pan_in_progress;
 #line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10592 "PhotoPage.c"
+#line 10594 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10680,7 +10682,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		self->priv->is_pan_in_progress = FALSE;
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10679 "PhotoPage.c"
+#line 10681 "PhotoPage.c"
 	}
 #line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
@@ -10690,7 +10692,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		result = FALSE;
 #line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10689 "PhotoPage.c"
+#line 10691 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10716,7 +10718,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_g_object_unref0 (_tmp29_);
 #line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10715 "PhotoPage.c"
+#line 10717 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
@@ -10730,13 +10732,13 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10729 "PhotoPage.c"
+#line 10731 "PhotoPage.c"
 	}
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10735 "PhotoPage.c"
+#line 10737 "PhotoPage.c"
 }
 
 
@@ -10757,7 +10759,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	result = _tmp1_;
 #line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10756 "PhotoPage.c"
+#line 10758 "PhotoPage.c"
 }
 
 
@@ -10766,7 +10768,7 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
 #line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10765 "PhotoPage.c"
+#line 10767 "PhotoPage.c"
 }
 
 
@@ -10806,7 +10808,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp4_) {
 #line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10805 "PhotoPage.c"
+#line 10807 "PhotoPage.c"
 	}
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
@@ -10824,7 +10826,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp8_) {
 #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 10823 "PhotoPage.c"
+#line 10825 "PhotoPage.c"
 	}
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10844,7 +10846,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	_data_collection_unref0 (_tmp13_);
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10843 "PhotoPage.c"
+#line 10845 "PhotoPage.c"
 }
 
 
@@ -10853,7 +10855,7 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10852 "PhotoPage.c"
+#line 10854 "PhotoPage.c"
 }
 
 
@@ -10866,7 +10868,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10865 "PhotoPage.c"
+#line 10867 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -10880,13 +10882,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
 #line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10879 "PhotoPage.c"
+#line 10881 "PhotoPage.c"
 	}
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10885 "PhotoPage.c"
+#line 10887 "PhotoPage.c"
 }
 
 
@@ -10937,7 +10939,7 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	_tmp10_ = _tmp9_.width;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10936 "PhotoPage.c"
+#line 10938 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
@@ -10952,17 +10954,17 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 		_tmp14_ = _tmp13_.height;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10951 "PhotoPage.c"
+#line 10953 "PhotoPage.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10955 "PhotoPage.c"
+#line 10957 "PhotoPage.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10961 "PhotoPage.c"
+#line 10963 "PhotoPage.c"
 }
 
 
@@ -10976,11 +10978,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
 	if (_tmp0_) {
 #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 10975 "PhotoPage.c"
+#line 10977 "PhotoPage.c"
 	} else {
 #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 10979 "PhotoPage.c"
+#line 10981 "PhotoPage.c"
 	}
 }
 
@@ -11003,7 +11005,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp0_ = self->priv->current_tool;
 #line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11002 "PhotoPage.c"
+#line 11004 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
@@ -11027,7 +11029,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11026 "PhotoPage.c"
+#line 11028 "PhotoPage.c"
 	}
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
@@ -11035,7 +11037,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp6_ = self->priv->is_pan_in_progress;
 #line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11034 "PhotoPage.c"
+#line 11036 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11109,7 +11111,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11108 "PhotoPage.c"
+#line 11110 "PhotoPage.c"
 	}
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
@@ -11125,7 +11127,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	result = _tmp28_;
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11124 "PhotoPage.c"
+#line 11126 "PhotoPage.c"
 }
 
 
@@ -11140,7 +11142,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	_tmp0_ = self->priv->current_tool;
 #line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11139 "PhotoPage.c"
+#line 11141 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11151,7 +11153,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 		result = _tmp2_;
 #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11150 "PhotoPage.c"
+#line 11152 "PhotoPage.c"
 	}
 #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));
@@ -11159,7 +11161,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	result = _tmp3_;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11158 "PhotoPage.c"
+#line 11160 "PhotoPage.c"
 }
 
 
@@ -11171,7 +11173,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11170 "PhotoPage.c"
+#line 11172 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
@@ -11187,7 +11189,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 		_tmp4_ = tool_window;
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11186 "PhotoPage.c"
+#line 11188 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11196,21 +11198,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11195 "PhotoPage.c"
+#line 11197 "PhotoPage.c"
 		} else {
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11199 "PhotoPage.c"
+#line 11201 "PhotoPage.c"
 		}
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11205 "PhotoPage.c"
+#line 11207 "PhotoPage.c"
 		}
 #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11209 "PhotoPage.c"
+#line 11211 "PhotoPage.c"
 	}
 }
 
@@ -11228,7 +11230,7 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	_tmp0_ = *rect;
 #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 11227 "PhotoPage.c"
+#line 11229 "PhotoPage.c"
 }
 
 
@@ -11248,7 +11250,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	_tmp1_ = *rect;
 #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 11247 "PhotoPage.c"
+#line 11249 "PhotoPage.c"
 }
 
 
@@ -11287,7 +11289,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	static GQuark _tmp6_label10 = 0;
 #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11286 "PhotoPage.c"
+#line 11288 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
@@ -11318,7 +11320,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11317 "PhotoPage.c"
+#line 11319 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
@@ -11328,13 +11330,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11327 "PhotoPage.c"
+#line 11329 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11333 "PhotoPage.c"
+#line 11335 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
@@ -11344,13 +11346,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11343 "PhotoPage.c"
+#line 11345 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11349 "PhotoPage.c"
+#line 11351 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
@@ -11360,13 +11362,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11359 "PhotoPage.c"
+#line 11361 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11365 "PhotoPage.c"
+#line 11367 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
@@ -11376,20 +11378,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11375 "PhotoPage.c"
+#line 11377 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11381 "PhotoPage.c"
+#line 11383 "PhotoPage.c"
 			default:
 			{
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11388 "PhotoPage.c"
+#line 11390 "PhotoPage.c"
 			}
 		}
 	}
@@ -11409,7 +11411,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	result = TRUE;
 #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11408 "PhotoPage.c"
+#line 11410 "PhotoPage.c"
 }
 
 
@@ -11442,7 +11444,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	static GQuark _tmp13_label6 = 0;
 #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11441 "PhotoPage.c"
+#line 11443 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11453,7 +11455,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	_tmp0_ = self->priv->current_tool;
 #line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11452 "PhotoPage.c"
+#line 11454 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -11469,14 +11471,14 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11468 "PhotoPage.c"
+#line 11470 "PhotoPage.c"
 		}
 	}
 #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
 #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11475 "PhotoPage.c"
+#line 11477 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11489,7 +11491,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11488 "PhotoPage.c"
+#line 11490 "PhotoPage.c"
 		}
 	}
 #line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11502,7 +11504,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11501 "PhotoPage.c"
+#line 11503 "PhotoPage.c"
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -11520,51 +11522,51 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11519 "PhotoPage.c"
+#line 11521 "PhotoPage.c"
 			default:
 			{
 #line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11524 "PhotoPage.c"
+#line 11526 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11530 "PhotoPage.c"
+#line 11532 "PhotoPage.c"
 			default:
 			{
 #line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11537 "PhotoPage.c"
+#line 11539 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11543 "PhotoPage.c"
+#line 11545 "PhotoPage.c"
 			default:
 			{
 #line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11550 "PhotoPage.c"
+#line 11552 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11556 "PhotoPage.c"
+#line 11558 "PhotoPage.c"
 			default:
 			{
 #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11563 "PhotoPage.c"
+#line 11565 "PhotoPage.c"
 			}
 		}
 	}
@@ -11576,11 +11578,11 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11575 "PhotoPage.c"
+#line 11577 "PhotoPage.c"
 	}
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11579 "PhotoPage.c"
+#line 11581 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11589,17 +11591,17 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		_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 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11588 "PhotoPage.c"
+#line 11590 "PhotoPage.c"
 	} else {
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11592 "PhotoPage.c"
+#line 11594 "PhotoPage.c"
 	}
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11598 "PhotoPage.c"
+#line 11600 "PhotoPage.c"
 }
 
 
@@ -11616,7 +11618,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 	_tmp0_ = self->priv->current_tool;
 #line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11615 "PhotoPage.c"
+#line 11617 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
@@ -11631,7 +11633,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 		_tmp4_ = *dim;
 #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11630 "PhotoPage.c"
+#line 11632 "PhotoPage.c"
 	}
 }
 
@@ -11650,21 +11652,21 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	_tmp1_ = self->priv->current_tool;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11649 "PhotoPage.c"
+#line 11651 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11655 "PhotoPage.c"
+#line 11657 "PhotoPage.c"
 	} else {
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11659 "PhotoPage.c"
+#line 11661 "PhotoPage.c"
 	}
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11663 "PhotoPage.c"
+#line 11665 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -11686,7 +11688,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11685 "PhotoPage.c"
+#line 11687 "PhotoPage.c"
 	}
 }
 
@@ -11697,7 +11699,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag
 	result = NULL;
 #line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11696 "PhotoPage.c"
+#line 11698 "PhotoPage.c"
 }
 
 
@@ -11706,7 +11708,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11705 "PhotoPage.c"
+#line 11707 "PhotoPage.c"
 }
 
 
@@ -11716,7 +11718,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage*
 	result = NULL;
 #line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11715 "PhotoPage.c"
+#line 11717 "PhotoPage.c"
 }
 
 
@@ -11725,7 +11727,7 @@ GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint s
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11724 "PhotoPage.c"
+#line 11726 "PhotoPage.c"
 }
 
 
@@ -11735,7 +11737,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage*
 	result = NULL;
 #line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11734 "PhotoPage.c"
+#line 11736 "PhotoPage.c"
 }
 
 
@@ -11744,7 +11746,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11743 "PhotoPage.c"
+#line 11745 "PhotoPage.c"
 }
 
 
@@ -11754,7 +11756,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa
 	result = NULL;
 #line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11753 "PhotoPage.c"
+#line 11755 "PhotoPage.c"
 }
 
 
@@ -11763,7 +11765,7 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11762 "PhotoPage.c"
+#line 11764 "PhotoPage.c"
 }
 
 
@@ -11797,7 +11799,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp0_ = self->priv->current_tool;
 #line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11796 "PhotoPage.c"
+#line 11798 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
 #line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11808,27 +11810,27 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
 #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11807 "PhotoPage.c"
+#line 11809 "PhotoPage.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11813 "PhotoPage.c"
+#line 11815 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11819 "PhotoPage.c"
+#line 11821 "PhotoPage.c"
 	} else {
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11823 "PhotoPage.c"
+#line 11825 "PhotoPage.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11827 "PhotoPage.c"
+#line 11829 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11900,7 +11902,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_g_object_unref0 (_tmp16_);
 #line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11899 "PhotoPage.c"
+#line 11901 "PhotoPage.c"
 	}
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
@@ -11916,7 +11918,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	if (!_tmp26_) {
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11915 "PhotoPage.c"
+#line 11917 "PhotoPage.c"
 	}
 #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_);
@@ -11930,7 +11932,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp29_ = trinket;
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 11929 "PhotoPage.c"
+#line 11931 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -12012,7 +12014,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp52_ = ctx;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12011 "PhotoPage.c"
+#line 12013 "PhotoPage.c"
 	}
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12024,7 +12026,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp54_ = trinket;
 #line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12023 "PhotoPage.c"
+#line 12025 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12091,7 +12093,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp72_ = ctx;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12090 "PhotoPage.c"
+#line 12092 "PhotoPage.c"
 	}
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12103,7 +12105,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp74_ = trinket;
 #line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12102 "PhotoPage.c"
+#line 12104 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12185,7 +12187,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp97_ = ctx;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12184 "PhotoPage.c"
+#line 12186 "PhotoPage.c"
 	}
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12197,7 +12199,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp99_ = trinket;
 #line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12196 "PhotoPage.c"
+#line 12198 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12294,11 +12296,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp127_ = ctx;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12293 "PhotoPage.c"
+#line 12295 "PhotoPage.c"
 	}
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12297 "PhotoPage.c"
+#line 12299 "PhotoPage.c"
 }
 
 
@@ -12315,7 +12317,7 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
 	result = !_tmp0_;
 #line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12314 "PhotoPage.c"
+#line 12316 "PhotoPage.c"
 }
 
 
@@ -12351,7 +12353,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	if (!_tmp1_) {
 #line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12350 "PhotoPage.c"
+#line 12352 "PhotoPage.c"
 	}
 #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -12383,7 +12385,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	_command_manager_unref0 (_tmp10_);
 #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12382 "PhotoPage.c"
+#line 12384 "PhotoPage.c"
 }
 
 
@@ -12392,7 +12394,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #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 12391 "PhotoPage.c"
+#line 12393 "PhotoPage.c"
 }
 
 
@@ -12401,7 +12403,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #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 12400 "PhotoPage.c"
+#line 12402 "PhotoPage.c"
 }
 
 
@@ -12410,7 +12412,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12409 "PhotoPage.c"
+#line 12411 "PhotoPage.c"
 }
 
 
@@ -12419,7 +12421,7 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12418 "PhotoPage.c"
+#line 12420 "PhotoPage.c"
 }
 
 
@@ -12447,7 +12449,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12446 "PhotoPage.c"
+#line 12448 "PhotoPage.c"
 	}
 #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
@@ -12459,7 +12461,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12458 "PhotoPage.c"
+#line 12460 "PhotoPage.c"
 	}
 #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
@@ -12473,7 +12475,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12472 "PhotoPage.c"
+#line 12474 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12510,7 +12512,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		if (_tmp14_) {
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12509 "PhotoPage.c"
+#line 12511 "PhotoPage.c"
 		}
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
@@ -12520,7 +12522,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		photo_revert_to_master (_tmp16_, TRUE);
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12519 "PhotoPage.c"
+#line 12521 "PhotoPage.c"
 	}
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -12550,7 +12552,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_command_manager_unref0 (_tmp22_);
 #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12549 "PhotoPage.c"
+#line 12551 "PhotoPage.c"
 }
 
 
@@ -12588,7 +12590,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12587 "PhotoPage.c"
+#line 12589 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12599,19 +12601,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12598 "PhotoPage.c"
+#line 12600 "PhotoPage.c"
 		}
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12604 "PhotoPage.c"
+#line 12606 "PhotoPage.c"
 	} else {
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12610 "PhotoPage.c"
+#line 12612 "PhotoPage.c"
 	}
 #line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12645,7 +12647,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12644 "PhotoPage.c"
+#line 12646 "PhotoPage.c"
 	}
 #line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12673,7 +12675,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12672 "PhotoPage.c"
+#line 12674 "PhotoPage.c"
 }
 
 
@@ -12711,7 +12713,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12710 "PhotoPage.c"
+#line 12712 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12722,19 +12724,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12721 "PhotoPage.c"
+#line 12723 "PhotoPage.c"
 		}
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12727 "PhotoPage.c"
+#line 12729 "PhotoPage.c"
 	} else {
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12733 "PhotoPage.c"
+#line 12735 "PhotoPage.c"
 	}
 #line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12768,7 +12770,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12767 "PhotoPage.c"
+#line 12769 "PhotoPage.c"
 	}
 #line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12796,7 +12798,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12795 "PhotoPage.c"
+#line 12797 "PhotoPage.c"
 }
 
 
@@ -12823,7 +12825,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12822 "PhotoPage.c"
+#line 12824 "PhotoPage.c"
 	}
 #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -12851,7 +12853,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	modify_originals = _tmp8_;
 #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12850 "PhotoPage.c"
+#line 12852 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12906,11 +12908,11 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		_command_manager_unref0 (_tmp21_);
 #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12905 "PhotoPage.c"
+#line 12907 "PhotoPage.c"
 	}
 #line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12909 "PhotoPage.c"
+#line 12911 "PhotoPage.c"
 }
 
 
@@ -12922,7 +12924,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12921 "PhotoPage.c"
+#line 12923 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -12947,7 +12949,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		screensaver = _tmp4_;
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12946 "PhotoPage.c"
+#line 12948 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -12984,11 +12986,11 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 12983 "PhotoPage.c"
+#line 12985 "PhotoPage.c"
 		}
 #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 12987 "PhotoPage.c"
+#line 12989 "PhotoPage.c"
 	}
 }
 
@@ -12996,7 +12998,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 12995 "PhotoPage.c"
+#line 12997 "PhotoPage.c"
 }
 
 
@@ -13042,7 +13044,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	if (_tmp6_ == NULL) {
 #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13041 "PhotoPage.c"
+#line 13043 "PhotoPage.c"
 	}
 #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -13052,7 +13054,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	result = _tmp8_;
 #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13051 "PhotoPage.c"
+#line 13053 "PhotoPage.c"
 }
 
 
@@ -13098,37 +13100,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	_tmp8_ = self->priv->current_tool;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13097 "PhotoPage.c"
+#line 13099 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13103 "PhotoPage.c"
+#line 13105 "PhotoPage.c"
 	} else {
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13107 "PhotoPage.c"
+#line 13109 "PhotoPage.c"
 	}
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13111 "PhotoPage.c"
+#line 13113 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13117 "PhotoPage.c"
+#line 13119 "PhotoPage.c"
 	} else {
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13121 "PhotoPage.c"
+#line 13123 "PhotoPage.c"
 	}
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
 #line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13127 "PhotoPage.c"
+#line 13129 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
@@ -13138,7 +13140,7 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	result = _tmp12_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13137 "PhotoPage.c"
+#line 13139 "PhotoPage.c"
 }
 
 
@@ -13173,7 +13175,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	_tmp3_ = _tmp2_;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13172 "PhotoPage.c"
+#line 13174 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13182,11 +13184,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		_tmp5_ = toggle;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13181 "PhotoPage.c"
+#line 13183 "PhotoPage.c"
 	} else {
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13185 "PhotoPage.c"
+#line 13187 "PhotoPage.c"
 	}
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
@@ -13202,7 +13204,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13201 "PhotoPage.c"
+#line 13203 "PhotoPage.c"
 	}
 #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13246,7 +13248,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	editing_host_page_activate_tool (self, _tmp17_);
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13245 "PhotoPage.c"
+#line 13247 "PhotoPage.c"
 }
 
 
@@ -13268,7 +13270,7 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13267 "PhotoPage.c"
+#line 13269 "PhotoPage.c"
 }
 
 
@@ -13290,7 +13292,7 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13289 "PhotoPage.c"
+#line 13291 "PhotoPage.c"
 }
 
 
@@ -13317,7 +13319,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	_tmp3_ = needs_improvement;
 #line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13316 "PhotoPage.c"
+#line 13318 "PhotoPage.c"
 }
 
 
@@ -13333,7 +13335,7 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #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 13332 "PhotoPage.c"
+#line 13334 "PhotoPage.c"
 }
 
 
@@ -13347,7 +13349,7 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13346 "PhotoPage.c"
+#line 13348 "PhotoPage.c"
 }
 
 
@@ -13365,7 +13367,7 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13364 "PhotoPage.c"
+#line 13366 "PhotoPage.c"
 }
 
 
@@ -13383,7 +13385,7 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13382 "PhotoPage.c"
+#line 13384 "PhotoPage.c"
 }
 
 
@@ -13401,7 +13403,7 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13400 "PhotoPage.c"
+#line 13402 "PhotoPage.c"
 }
 
 
@@ -13419,7 +13421,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13418 "PhotoPage.c"
+#line 13420 "PhotoPage.c"
 }
 
 
@@ -13428,7 +13430,7 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t
 	result = editing_tools_straighten_tool_factory ();
 #line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13427 "PhotoPage.c"
+#line 13429 "PhotoPage.c"
 }
 
 
@@ -13440,7 +13442,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->straighten_button;
 #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 13439 "PhotoPage.c"
+#line 13441 "PhotoPage.c"
 }
 
 
@@ -13449,7 +13451,7 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e
 	result = editing_tools_crop_tool_factory ();
 #line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13448 "PhotoPage.c"
+#line 13450 "PhotoPage.c"
 }
 
 
@@ -13461,7 +13463,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->crop_button;
 #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 13460 "PhotoPage.c"
+#line 13462 "PhotoPage.c"
 }
 
 
@@ -13470,7 +13472,7 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools
 	result = editing_tools_redeye_tool_factory ();
 #line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13469 "PhotoPage.c"
+#line 13471 "PhotoPage.c"
 }
 
 
@@ -13482,7 +13484,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->redeye_button;
 #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 13481 "PhotoPage.c"
+#line 13483 "PhotoPage.c"
 }
 
 
@@ -13491,7 +13493,7 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
 	result = editing_tools_adjust_tool_factory ();
 #line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13490 "PhotoPage.c"
+#line 13492 "PhotoPage.c"
 }
 
 
@@ -13503,7 +13505,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->adjust_button;
 #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 13502 "PhotoPage.c"
+#line 13504 "PhotoPage.c"
 }
 
 
@@ -13520,7 +13522,7 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
 	result = !_tmp0_;
 #line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13519 "PhotoPage.c"
+#line 13521 "PhotoPage.c"
 }
 
 
@@ -13545,7 +13547,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13544 "PhotoPage.c"
+#line 13546 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13553,7 +13555,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		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 13552 "PhotoPage.c"
+#line 13554 "PhotoPage.c"
 	}
 #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
@@ -13561,7 +13563,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13560 "PhotoPage.c"
+#line 13562 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
@@ -13573,7 +13575,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp5_ = adjust_tool;
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13572 "PhotoPage.c"
+#line 13574 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
 #line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
@@ -13583,7 +13585,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		_editing_tools_editing_tool_unref0 (adjust_tool);
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13582 "PhotoPage.c"
+#line 13584 "PhotoPage.c"
 	}
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
@@ -13611,7 +13613,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13610 "PhotoPage.c"
+#line 13612 "PhotoPage.c"
 }
 
 
@@ -13629,7 +13631,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13628 "PhotoPage.c"
+#line 13630 "PhotoPage.c"
 	}
 #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -13647,7 +13649,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (_tmp2_);
 #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 13646 "PhotoPage.c"
+#line 13648 "PhotoPage.c"
 }
 
 
@@ -13677,14 +13679,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13676 "PhotoPage.c"
+#line 13678 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13683 "PhotoPage.c"
+#line 13685 "PhotoPage.c"
 	}
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13692,7 +13694,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13691 "PhotoPage.c"
+#line 13693 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
@@ -13722,7 +13724,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13721 "PhotoPage.c"
+#line 13723 "PhotoPage.c"
 }
 
 
@@ -13777,7 +13779,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	if (_tmp0_ == NULL) {
 #line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13776 "PhotoPage.c"
+#line 13778 "PhotoPage.c"
 	}
 #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13793,7 +13795,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (tool_window);
 #line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13792 "PhotoPage.c"
+#line 13794 "PhotoPage.c"
 	}
 #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13827,7 +13829,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_free0 (_tmp12_);
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 13826 "PhotoPage.c"
+#line 13828 "PhotoPage.c"
 		GeeHashMap* _tmp15_ = NULL;
 		EditingToolsEditingTool* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -13872,7 +13874,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		y = (gint) ((gintptr) _tmp26_);
 #line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp25_);
-#line 13871 "PhotoPage.c"
+#line 13873 "PhotoPage.c"
 	} else {
 		GtkWindow* _tmp27_ = NULL;
 		GtkWindow* _tmp28_ = NULL;
@@ -13895,7 +13897,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (_tmp28_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp31_) {
-#line 13894 "PhotoPage.c"
+#line 13896 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
 			GtkWindow* _tmp32_ = NULL;
@@ -13970,7 +13972,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			cheight = _tmp46_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13969 "PhotoPage.c"
+#line 13971 "PhotoPage.c"
 				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
@@ -13988,7 +13990,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp52_ = _tmp51_.width;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2);
-#line 13987 "PhotoPage.c"
+#line 13989 "PhotoPage.c"
 			} else {
 				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
@@ -14001,7 +14003,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp55_ = cwidth;
 #line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2);
-#line 14000 "PhotoPage.c"
+#line 14002 "PhotoPage.c"
 			}
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp47_;
@@ -14017,7 +14019,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp60_ = _tmp59_.height;
 #line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3);
-#line 14016 "PhotoPage.c"
+#line 14018 "PhotoPage.c"
 		} else {
 			GtkWindow* _tmp61_ = NULL;
 			GtkWindow* _tmp62_ = NULL;
@@ -14096,13 +14098,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp79_ = self->priv->current_tool;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14095 "PhotoPage.c"
+#line 14097 "PhotoPage.c"
 				gint _tmp80_ = 0;
 #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp80_ = x;
 #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp80_ * 3) / 4;
-#line 14101 "PhotoPage.c"
+#line 14103 "PhotoPage.c"
 			} else {
 				gint _tmp81_ = 0;
 				GtkAllocation _tmp82_ = {0};
@@ -14115,11 +14117,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp83_ = _tmp82_.width;
 #line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp81_ - _tmp83_) / 2;
-#line 14114 "PhotoPage.c"
+#line 14116 "PhotoPage.c"
 			}
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14118 "PhotoPage.c"
+#line 14120 "PhotoPage.c"
 		}
 	}
 #line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14184,7 +14186,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_object_unref0 (screen);
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14183 "PhotoPage.c"
+#line 14185 "PhotoPage.c"
 }
 
 
@@ -14218,7 +14220,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14217 "PhotoPage.c"
+#line 14219 "PhotoPage.c"
 	}
 #line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14256,7 +14258,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14255 "PhotoPage.c"
+#line 14257 "PhotoPage.c"
 	}
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14264,14 +14266,14 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14263 "PhotoPage.c"
+#line 14265 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14270 "PhotoPage.c"
+#line 14272 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14287,7 +14289,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14286 "PhotoPage.c"
+#line 14288 "PhotoPage.c"
 			}
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14311,7 +14313,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14310 "PhotoPage.c"
+#line 14312 "PhotoPage.c"
 			}
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
@@ -14323,7 +14325,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14322 "PhotoPage.c"
+#line 14324 "PhotoPage.c"
 			}
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
@@ -14335,7 +14337,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14334 "PhotoPage.c"
+#line 14336 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
@@ -14347,7 +14349,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14346 "PhotoPage.c"
+#line 14348 "PhotoPage.c"
 			}
 #line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
@@ -14357,7 +14359,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (next_photo);
 #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14356 "PhotoPage.c"
+#line 14358 "PhotoPage.c"
 		}
 	}
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14366,7 +14368,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14365 "PhotoPage.c"
+#line 14367 "PhotoPage.c"
 }
 
 
@@ -14400,7 +14402,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14399 "PhotoPage.c"
+#line 14401 "PhotoPage.c"
 	}
 #line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14438,7 +14440,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14437 "PhotoPage.c"
+#line 14439 "PhotoPage.c"
 	}
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14446,14 +14448,14 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14445 "PhotoPage.c"
+#line 14447 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14452 "PhotoPage.c"
+#line 14454 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14469,7 +14471,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14468 "PhotoPage.c"
+#line 14470 "PhotoPage.c"
 			}
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14493,7 +14495,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14492 "PhotoPage.c"
+#line 14494 "PhotoPage.c"
 			}
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
@@ -14505,7 +14507,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14504 "PhotoPage.c"
+#line 14506 "PhotoPage.c"
 			}
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
@@ -14517,7 +14519,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14516 "PhotoPage.c"
+#line 14518 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
@@ -14529,7 +14531,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14528 "PhotoPage.c"
+#line 14530 "PhotoPage.c"
 			}
 #line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
@@ -14539,7 +14541,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (previous_photo);
 #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14538 "PhotoPage.c"
+#line 14540 "PhotoPage.c"
 		}
 	}
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14548,7 +14550,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14547 "PhotoPage.c"
+#line 14549 "PhotoPage.c"
 }
 
 
@@ -14563,7 +14565,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	result = _tmp0_ != NULL;
 #line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14562 "PhotoPage.c"
+#line 14564 "PhotoPage.c"
 }
 
 
@@ -14574,7 +14576,7 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) {
 	_data_collection_unref0 (self->priv->parent_view);
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14573 "PhotoPage.c"
+#line 14575 "PhotoPage.c"
 }
 
 
@@ -14661,14 +14663,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 14660 "PhotoPage.c"
+#line 14662 "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 14667 "PhotoPage.c"
+#line 14669 "PhotoPage.c"
 }
 
 
@@ -14681,7 +14683,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 14680 "PhotoPage.c"
+#line 14682 "PhotoPage.c"
 }
 
 
@@ -14694,14 +14696,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 14693 "PhotoPage.c"
+#line 14695 "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 14700 "PhotoPage.c"
+#line 14702 "PhotoPage.c"
 }
 
 
@@ -14713,7 +14715,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 14712 "PhotoPage.c"
+#line 14714 "PhotoPage.c"
 }
 
 
@@ -14832,7 +14834,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 14831 "PhotoPage.c"
+#line 14833 "PhotoPage.c"
 }
 
 
@@ -14900,7 +14902,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 14899 "PhotoPage.c"
+#line 14901 "PhotoPage.c"
 }
 
 
@@ -14984,7 +14986,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 14983 "PhotoPage.c"
+#line 14985 "PhotoPage.c"
 }
 
 
@@ -15003,378 +15005,364 @@ 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 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15002 "PhotoPage.c"
+#line 15004 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15009 "PhotoPage.c"
+#line 15011 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15016 "PhotoPage.c"
+#line 15018 "PhotoPage.c"
 }
 
 
 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 15023 "PhotoPage.c"
+#line 15025 "PhotoPage.c"
 }
 
 
 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 15030 "PhotoPage.c"
+#line 15032 "PhotoPage.c"
 }
 
 
 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 15037 "PhotoPage.c"
+#line 15039 "PhotoPage.c"
 }
 
 
 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 15044 "PhotoPage.c"
+#line 15046 "PhotoPage.c"
 }
 
 
 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 15051 "PhotoPage.c"
+#line 15053 "PhotoPage.c"
 }
 
 
 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 15058 "PhotoPage.c"
+#line 15060 "PhotoPage.c"
 }
 
 
 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 15065 "PhotoPage.c"
+#line 15067 "PhotoPage.c"
 }
 
 
 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 15072 "PhotoPage.c"
+#line 15074 "PhotoPage.c"
 }
 
 
 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 15079 "PhotoPage.c"
+#line 15081 "PhotoPage.c"
 }
 
 
 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 15086 "PhotoPage.c"
+#line 15088 "PhotoPage.c"
 }
 
 
 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 15093 "PhotoPage.c"
+#line 15095 "PhotoPage.c"
 }
 
 
 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 15100 "PhotoPage.c"
+#line 15102 "PhotoPage.c"
 }
 
 
 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 15107 "PhotoPage.c"
+#line 15109 "PhotoPage.c"
 }
 
 
 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 15114 "PhotoPage.c"
+#line 15116 "PhotoPage.c"
 }
 
 
 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 15121 "PhotoPage.c"
+#line 15123 "PhotoPage.c"
 }
 
 
 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 15128 "PhotoPage.c"
+#line 15130 "PhotoPage.c"
 }
 
 
 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 15135 "PhotoPage.c"
+#line 15137 "PhotoPage.c"
 }
 
 
 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 15142 "PhotoPage.c"
+#line 15144 "PhotoPage.c"
 }
 
 
 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 15149 "PhotoPage.c"
+#line 15151 "PhotoPage.c"
 }
 
 
 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 15156 "PhotoPage.c"
+#line 15158 "PhotoPage.c"
 }
 
 
 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 15163 "PhotoPage.c"
+#line 15165 "PhotoPage.c"
 }
 
 
 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 15170 "PhotoPage.c"
+#line 15172 "PhotoPage.c"
 }
 
 
 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 15177 "PhotoPage.c"
+#line 15179 "PhotoPage.c"
 }
 
 
 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 15184 "PhotoPage.c"
+#line 15186 "PhotoPage.c"
 }
 
 
 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 15191 "PhotoPage.c"
+#line 15193 "PhotoPage.c"
 }
 
 
 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 15198 "PhotoPage.c"
+#line 15200 "PhotoPage.c"
 }
 
 
 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 15205 "PhotoPage.c"
+#line 15207 "PhotoPage.c"
 }
 
 
 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 15212 "PhotoPage.c"
+#line 15214 "PhotoPage.c"
 }
 
 
 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 15219 "PhotoPage.c"
+#line 15221 "PhotoPage.c"
 }
 
 
 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 15226 "PhotoPage.c"
+#line 15228 "PhotoPage.c"
 }
 
 
 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 15233 "PhotoPage.c"
+#line 15235 "PhotoPage.c"
 }
 
 
 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 15240 "PhotoPage.c"
+#line 15242 "PhotoPage.c"
 }
 
 
 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 15247 "PhotoPage.c"
+#line 15249 "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 15254 "PhotoPage.c"
+#line 15256 "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 15261 "PhotoPage.c"
+#line 15263 "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 15268 "PhotoPage.c"
+#line 15270 "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 15275 "PhotoPage.c"
+#line 15277 "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 15282 "PhotoPage.c"
+#line 15284 "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 15289 "PhotoPage.c"
+#line 15291 "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 15296 "PhotoPage.c"
+#line 15298 "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 15303 "PhotoPage.c"
+#line 15305 "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 15310 "PhotoPage.c"
+#line 15312 "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 15317 "PhotoPage.c"
+#line 15319 "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 15324 "PhotoPage.c"
+#line 15326 "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 15331 "PhotoPage.c"
+#line 15333 "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 15338 "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 15345 "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 15352 "PhotoPage.c"
+#line 15340 "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 15359 "PhotoPage.c"
+#line 15347 "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 15366 "PhotoPage.c"
+#line 15354 "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 15373 "PhotoPage.c"
+#line 15361 "PhotoPage.c"
 }
 
 
@@ -15440,14 +15428,14 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	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 15439 "PhotoPage.c"
+#line 15427 "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 15446 "PhotoPage.c"
+#line 15434 "PhotoPage.c"
 }
 
 
@@ -15478,7 +15466,7 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	result = _tmp4_;
 #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15477 "PhotoPage.c"
+#line 15465 "PhotoPage.c"
 }
 
 
@@ -15492,7 +15480,7 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
 	_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 15491 "PhotoPage.c"
+#line 15479 "PhotoPage.c"
 }
 
 
@@ -15506,7 +15494,7 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
 	_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 15505 "PhotoPage.c"
+#line 15493 "PhotoPage.c"
 }
 
 
@@ -15531,28 +15519,35 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	_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 15530 "PhotoPage.c"
+#line 15518 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new16 (gboolean value) {
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15537 "PhotoPage.c"
+#line 15525 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new17 (const gchar* value) {
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15544 "PhotoPage.c"
+#line 15532 "PhotoPage.c"
+}
+
+
+static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
+#line 15539 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_add_actions (Page* base) {
+static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	LibraryPhotoPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
@@ -15565,158 +15560,206 @@ static void library_photo_page_real_add_actions (Page* base) {
 	ConfigFacade* _tmp10_ = NULL;
 	RawDeveloper _tmp11_ = 0;
 	RawDeveloper _tmp12_ = 0;
+	const gchar* _tmp13_ = NULL;
+	RawDeveloper _tmp14_ = 0;
 	GSimpleAction* action = NULL;
-	GAction* _tmp13_ = NULL;
-	GSimpleAction* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	RawDeveloper _tmp16_ = 0;
+	const GVariantType* _tmp15_ = NULL;
+	GVariant* _tmp16_ = NULL;
 	GSimpleAction* _tmp17_ = NULL;
-	GVariant* _tmp18_ = NULL;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	GSimpleAction* _tmp18_ = NULL;
+	GActionMap* _tmp19_ = NULL;
+#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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"
-	_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 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = map;
+#line 2437 "/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), _tmp0_);
+#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = map;
+#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_action_map_add_action_entries (_tmp1_, 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"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15591 "PhotoPage.c"
+#line 15587 "PhotoPage.c"
 	}
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/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"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _variant_new16 (_tmp7_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = config_facade_get_instance ();
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/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"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	d = _tmp12_;
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+	_tmp14_ = d;
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp13_) : NULL;
+	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_ == NULL) {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp13_);
-#line 15631 "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 15641 "PhotoPage.c"
+		_tmp13_ = "Shotwell";
+#line 15625 "PhotoPage.c"
 	} else {
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = "Camera";
-#line 15645 "PhotoPage.c"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp13_ = "Camera";
+#line 15629 "PhotoPage.c"
 	}
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp15_ = G_VARIANT_TYPE_STRING;
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = _variant_new17 (_tmp13_);
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = g_simple_action_new_stateful ("RawDeveloper", _tmp15_, _tmp16_);
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp18_ = _tmp17_;
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_variant_unref0 (_tmp16_);
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	action = _tmp18_;
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = action;
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _variant_new17 (_tmp15_);
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_emit_by_name (_tmp17_, "change-state", _tmp18_);
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_variant_unref0 (_tmp18_);
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (action, "change-state", (GCallback) _library_photo_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_simple_action_set_enabled (action, TRUE);
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp19_ = map;
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
+#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15657 "PhotoPage.c"
+#line 15653 "PhotoPage.c"
+}
+
+
+static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
+	LibraryPhotoPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = map;
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
+#line 15668 "PhotoPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		entry_collection = LIBRARY_PHOTO_PAGE_entries;
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
+#line 15680 "PhotoPage.c"
+			GActionEntry entry = {0};
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			entry = entry_collection[entry_it];
+#line 15684 "PhotoPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp1_ = map;
+#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp2_ = entry;
+#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 15697 "PhotoPage.c"
+			}
+		}
+	}
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15664 "PhotoPage.c"
+#line 15707 "PhotoPage.c"
 }
 
 
 static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15675 "PhotoPage.c"
+#line 15718 "PhotoPage.c"
 	}
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15681 "PhotoPage.c"
+#line 15724 "PhotoPage.c"
 }
 
 
 static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15692 "PhotoPage.c"
+#line 15735 "PhotoPage.c"
 	}
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15698 "PhotoPage.c"
+#line 15741 "PhotoPage.c"
 }
 
 
 static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15709 "PhotoPage.c"
+#line 15752 "PhotoPage.c"
 	}
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15715 "PhotoPage.c"
+#line 15758 "PhotoPage.c"
 }
 
 
@@ -15748,85 +15791,85 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2457 "/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 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups = _tmp1_;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = injection_group_new ("PrintPlaceholder");
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	print_group = _tmp2_;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("_Print");
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2460 "/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"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = groups;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _injection_group_ref0 (print_group);
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2462 "/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"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = injection_group_new ("PublishPlaceholder");
-#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	publish_group = _tmp6_;
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _ ("_Publish");
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/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"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = groups;
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _injection_group_ref0 (publish_group);
-#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2467 "/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"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
-#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	bg_group = _tmp10_;
-#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _ ("Set as _Desktop Background");
-#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = groups;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _injection_group_ref0 (bg_group);
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2472 "/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"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = groups;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (result_length1) {
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 15813 "PhotoPage.c"
+#line 15856 "PhotoPage.c"
 	}
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp14_;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (publish_group);
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15825 "PhotoPage.c"
+#line 15868 "PhotoPage.c"
 }
 
 
@@ -15838,33 +15881,33 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2477 "/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"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	display = _tmp1_;
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, display);
-#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/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 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = action;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = value;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15863 "PhotoPage.c"
+#line 15906 "PhotoPage.c"
 }
 
 
@@ -15873,38 +15916,38 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	GAction* _tmp0_ = NULL;
 	GSimpleAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2488 "/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"
+#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15882 "PhotoPage.c"
+#line 15925 "PhotoPage.c"
 	}
-#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
-#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = action;
-#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15890 "PhotoPage.c"
+#line 15933 "PhotoPage.c"
 		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = display;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15899 "PhotoPage.c"
+#line 15942 "PhotoPage.c"
 	}
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15903 "PhotoPage.c"
+#line 15946 "PhotoPage.c"
 }
 
 
@@ -15942,241 +15985,241 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	gboolean _tmp56_ = FALSE;
 	gint _tmp61_ = 0;
 	gint _tmp62_ = 0;
-#line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple = _tmp3_;
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/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 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 15959 "PhotoPage.c"
+#line 16002 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/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 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/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 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp8_;
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 15973 "PhotoPage.c"
+#line 16016 "PhotoPage.c"
 	} else {
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 15977 "PhotoPage.c"
+#line 16020 "PhotoPage.c"
 	}
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/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 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 15985 "PhotoPage.c"
+#line 16028 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/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 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = photo_get_master_file_format (_tmp12_);
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 15999 "PhotoPage.c"
+#line 16042 "PhotoPage.c"
 	} else {
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16003 "PhotoPage.c"
+#line 16046 "PhotoPage.c"
 	}
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/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 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16011 "PhotoPage.c"
+#line 16054 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = config_facade_get_instance ();
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/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 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = g_strcmp0 (_tmp19_, "") != 0;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp19_);
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16030 "PhotoPage.c"
+#line 16073 "PhotoPage.c"
 	} else {
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16034 "PhotoPage.c"
+#line 16077 "PhotoPage.c"
 	}
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
-#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2501 "/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 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16042 "PhotoPage.c"
+#line 16085 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/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 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = photo_has_transformations (_tmp24_);
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp26_) {
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16062 "PhotoPage.c"
+#line 16105 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/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 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = _tmp27_;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = photo_has_editable (_tmp28_);
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = _tmp29_;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16077 "PhotoPage.c"
+#line 16120 "PhotoPage.c"
 		}
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16081 "PhotoPage.c"
+#line 16124 "PhotoPage.c"
 	} else {
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16085 "PhotoPage.c"
+#line 16128 "PhotoPage.c"
 	}
-#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16093 "PhotoPage.c"
+#line 16136 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16099 "PhotoPage.c"
+#line 16142 "PhotoPage.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16103 "PhotoPage.c"
+#line 16146 "PhotoPage.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16111 "PhotoPage.c"
+#line 16154 "PhotoPage.c"
 	}
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2509 "/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 2500 "/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), "SetBackground", _tmp33_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/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 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16121 "PhotoPage.c"
+#line 16164 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/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 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = photo_has_color_adjustments (_tmp37_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = _tmp38_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16135 "PhotoPage.c"
+#line 16178 "PhotoPage.c"
 	} else {
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16139 "PhotoPage.c"
+#line 16182 "PhotoPage.c"
 	}
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_);
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = multiple;
-#line 2505 "/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), "PrevPhoto", _tmp40_);
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = multiple;
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_);
-#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = rotate_possible;
-#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_);
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = rotate_possible;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_);
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = rotate_possible;
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_);
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = rotate_possible;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_);
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/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 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16175 "PhotoPage.c"
+#line 16218 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -16185,134 +16228,134 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		Photo* _tmp52_ = NULL;
 		Scaling _tmp53_ = {0};
 		gboolean _tmp54_ = FALSE;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/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 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp49_);
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_);
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_);
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp48_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/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 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = _tmp51_;
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp53_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16208 "PhotoPage.c"
+#line 16251 "PhotoPage.c"
 	}
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp56_ = is_raw;
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16216 "PhotoPage.c"
+#line 16259 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
 		gchar* _tmp60_ = NULL;
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = config_facade_get_instance ();
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/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 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = g_strcmp0 (_tmp60_, "") != 0;
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp60_);
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16235 "PhotoPage.c"
+#line 16278 "PhotoPage.c"
 	} else {
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16239 "PhotoPage.c"
+#line 16282 "PhotoPage.c"
 	}
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = selected_count;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = count;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2532 "/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 16249 "PhotoPage.c"
+#line 16292 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/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 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16262 "PhotoPage.c"
+#line 16305 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/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 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = photo_has_transformations (_tmp4_);
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16282 "PhotoPage.c"
+#line 16325 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/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 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp7_;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo_has_editable (_tmp8_);
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp9_;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16297 "PhotoPage.c"
+#line 16340 "PhotoPage.c"
 		}
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16301 "PhotoPage.c"
+#line 16344 "PhotoPage.c"
 	} else {
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16305 "PhotoPage.c"
+#line 16348 "PhotoPage.c"
 	}
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
-#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16311 "PhotoPage.c"
+#line 16354 "PhotoPage.c"
 }
 
 
@@ -16322,78 +16365,78 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GQuark _tmp4_ = 0U;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label0 = 0;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16325 "PhotoPage.c"
+#line 16368 "PhotoPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/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"
+#line 2543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/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"
+#line 2545 "/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"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16347 "PhotoPage.c"
+#line 16390 "PhotoPage.c"
 			default:
 			{
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
-#line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16354 "PhotoPage.c"
+#line 16397 "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"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16360 "PhotoPage.c"
+#line 16403 "PhotoPage.c"
 			default:
 			{
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16367 "PhotoPage.c"
+#line 16410 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16373 "PhotoPage.c"
+#line 16416 "PhotoPage.c"
 			default:
 			{
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16378 "PhotoPage.c"
+#line 16421 "PhotoPage.c"
 			}
 		}
 	}
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = developer;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_developer_changed (self, _tmp5_);
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = action;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = value;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16392 "PhotoPage.c"
+#line 16435 "PhotoPage.c"
 }
 
 
@@ -16417,106 +16460,106 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	gboolean _tmp19_ = FALSE;
 	Photo* _tmp20_ = NULL;
 	gboolean _tmp21_ = FALSE;
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16430 "PhotoPage.c"
+#line 16473 "PhotoPage.c"
 	}
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = gee_list_get (_tmp7_, 0);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = (DataView*) _tmp8_;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = data_view_get_source (_tmp9_);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16452 "PhotoPage.c"
+#line 16495 "PhotoPage.c"
 	}
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp12_;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = photo;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == NULL) {
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16470 "PhotoPage.c"
+#line 16513 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
 		RawDeveloper _tmp17_ = 0;
 		gboolean _tmp18_ = FALSE;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = rd;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo_get_raw_developer (_tmp16_);
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16486 "PhotoPage.c"
+#line 16529 "PhotoPage.c"
 	}
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16494 "PhotoPage.c"
+#line 16537 "PhotoPage.c"
 	}
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = photo_has_transformations (_tmp20_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16504 "PhotoPage.c"
+#line 16547 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16511 "PhotoPage.c"
+#line 16554 "PhotoPage.c"
 	}
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16515 "PhotoPage.c"
+#line 16558 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -16528,73 +16571,73 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		CommandManager* _tmp30_ = NULL;
 		CommandManager* _tmp31_ = NULL;
 		SetRawDeveloperCommand* _tmp32_ = NULL;
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_selected (_tmp24_);
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = rd;
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/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 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = _tmp28_;
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp29_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = command;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp31_);
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16561 "PhotoPage.c"
+#line 16604 "PhotoPage.c"
 	}
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16565 "PhotoPage.c"
+#line 16608 "PhotoPage.c"
 }
 
 
 void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16574 "PhotoPage.c"
+#line 16617 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/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 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16586 "PhotoPage.c"
+#line 16629 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16593 "PhotoPage.c"
+#line 16636 "PhotoPage.c"
 }
 
 
@@ -16605,75 +16648,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	Photo* _tmp9_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (return_page));
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = return_page;
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = _tmp1_;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = return_page;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2591 "/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 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = view;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16628 "PhotoPage.c"
+#line 16671 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _data_collection_ref0 (_tmp5_);
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16639 "PhotoPage.c"
+#line 16682 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16651 "PhotoPage.c"
+#line 16694 "PhotoPage.c"
 	}
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/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 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16659 "PhotoPage.c"
+#line 16702 "PhotoPage.c"
 }
 
 
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2600 "/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 16672 "PhotoPage.c"
+#line 16715 "PhotoPage.c"
 }
 
 
@@ -16681,17 +16724,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_ = NULL;
 	CollectionPage* _tmp1_ = NULL;
-#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16690 "PhotoPage.c"
+#line 16733 "PhotoPage.c"
 }
 
 
@@ -16702,33 +16745,80 @@ static void library_photo_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2611 "/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 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp1_ != NULL, "get_photo() != null");
-#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/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 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/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 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, _tmp4_);
-#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16727 "PhotoPage.c"
+#line 16770 "PhotoPage.c"
+}
+
+
+static void library_photo_page_real_switching_from (Page* base) {
+	LibraryPhotoPage * self;
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
+#line 16780 "PhotoPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		entry_collection = LIBRARY_PHOTO_PAGE_entries;
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
+#line 16792 "PhotoPage.c"
+			GActionEntry entry = {0};
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			entry = entry_collection[entry_it];
+#line 16796 "PhotoPage.c"
+			{
+				AppWindow* _tmp0_ = NULL;
+				AppWindow* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp0_ = app_window_get_instance ();
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp1_ = _tmp0_;
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp2_ = entry;
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_g_object_unref0 (_tmp1_);
+#line 16814 "PhotoPage.c"
+			}
+		}
+	}
 }
 
 
@@ -16743,58 +16833,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	gint _tmp8_ = 0;
 	GdkPixbuf* _tmp9_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
-#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/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 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16750 "PhotoPage.c"
+#line 16840 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/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 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16765 "PhotoPage.c"
+#line 16855 "PhotoPage.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16773 "PhotoPage.c"
+#line 16863 "PhotoPage.c"
 	}
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/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 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scale;
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp10_;
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16793 "PhotoPage.c"
+#line 16883 "PhotoPage.c"
 }
 
 
@@ -16804,46 +16894,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 2619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/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 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16811 "PhotoPage.c"
+#line 16901 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/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 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16826 "PhotoPage.c"
+#line 16916 "PhotoPage.c"
 	}
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16834 "PhotoPage.c"
+#line 16924 "PhotoPage.c"
 	}
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp5_;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16842 "PhotoPage.c"
+#line 16932 "PhotoPage.c"
 }
 
 
@@ -16859,51 +16949,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* _tmp7_ = NULL;
 	SlideshowPage* _tmp8_ = NULL;
 	SlideshowPage* _tmp9_ = NULL;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/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 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16872 "PhotoPage.c"
+#line 16962 "PhotoPage.c"
 	}
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/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 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page));
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16902 "PhotoPage.c"
+#line 16992 "PhotoPage.c"
 }
 
 
@@ -16914,73 +17004,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/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 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 16921 "PhotoPage.c"
+#line 17011 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/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 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 16927 "PhotoPage.c"
+#line 17017 "PhotoPage.c"
 	} else {
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16931 "PhotoPage.c"
+#line 17021 "PhotoPage.c"
 	}
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/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 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 16941 "PhotoPage.c"
+#line 17031 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/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 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 16947 "PhotoPage.c"
+#line 17037 "PhotoPage.c"
 	} else {
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16951 "PhotoPage.c"
+#line 17041 "PhotoPage.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 16955 "PhotoPage.c"
+#line 17045 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2640 "/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 2641 "/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_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2643 "/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 16967 "PhotoPage.c"
+#line 17057 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2646 "/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 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/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 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 16979 "PhotoPage.c"
+#line 17069 "PhotoPage.c"
 }
 
 
@@ -16992,43 +17082,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 	GdkEventKey* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	const gchar* _tmp4_ = NULL;
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/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 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17005 "PhotoPage.c"
+#line 17095 "PhotoPage.c"
 	}
-#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17021 "PhotoPage.c"
+#line 17111 "PhotoPage.c"
 	} else {
-#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17027 "PhotoPage.c"
+#line 17117 "PhotoPage.c"
 	}
 }
 
@@ -17038,77 +17128,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	gboolean sensitivity = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 2667 "/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), "SendTo", sensitivity);
-#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", sensitivity);
-#line 2669 "/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), "Print", sensitivity);
-#line 2670 "/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), "CommonJumpToFile", sensitivity);
-#line 2672 "/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), "CommonUndo", sensitivity);
-#line 2673 "/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), "CommonRedo", sensitivity);
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", sensitivity);
-#line 2676 "/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), "DecreaseSize", sensitivity);
-#line 2677 "/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), "ZoomFit", sensitivity);
-#line 2678 "/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), "Zoom100", sensitivity);
-#line 2679 "/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), "Zoom200", sensitivity);
-#line 2680 "/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), "Slideshow", sensitivity);
-#line 2682 "/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), "RotateClockwise", sensitivity);
-#line 2683 "/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), "RotateCounterclockwise", sensitivity);
-#line 2684 "/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), "FlipHorizontally", sensitivity);
-#line 2685 "/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), "FlipVertically", sensitivity);
-#line 2686 "/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), "Enhance", sensitivity);
-#line 2687 "/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), "Crop", sensitivity);
-#line 2688 "/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), "RedEye", sensitivity);
-#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity);
-#line 2690 "/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), "EditTitle", sensitivity);
-#line 2691 "/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), "AdjustDateTime", sensitivity);
-#line 2692 "/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), "ExternalEdit", sensitivity);
-#line 2693 "/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), "ExternalEditRAW", sensitivity);
-#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity);
-#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity);
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity);
-#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity);
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity);
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/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 17107 "PhotoPage.c"
+#line 17197 "PhotoPage.c"
 }
 
 
@@ -17117,36 +17207,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17124 "PhotoPage.c"
+#line 17214 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
-#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2725 "/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 17130 "PhotoPage.c"
+#line 17220 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/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 17137 "PhotoPage.c"
+#line 17227 "PhotoPage.c"
 	}
-#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = missing;
-#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/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 17145 "PhotoPage.c"
+#line 17235 "PhotoPage.c"
 }
 
 
@@ -17160,300 +17250,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 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label6 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label7 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label8 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label9 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label10 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label11 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label12 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label13 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label14 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label15 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label16 = 0;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label17 = 0;
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17201 "PhotoPage.c"
+#line 17291 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/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 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17210 "PhotoPage.c"
+#line 17300 "PhotoPage.c"
 	} else {
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17214 "PhotoPage.c"
+#line 17304 "PhotoPage.c"
 	}
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17222 "PhotoPage.c"
+#line 17312 "PhotoPage.c"
 	}
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/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 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17240 "PhotoPage.c"
+#line 17330 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
 				GtkWindow* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = _tmp9_;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp10_);
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp11_) {
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17258 "PhotoPage.c"
+#line 17348 "PhotoPage.c"
 				}
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17262 "PhotoPage.c"
+#line 17352 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17268 "PhotoPage.c"
+#line 17358 "PhotoPage.c"
 			default:
 			{
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17275 "PhotoPage.c"
+#line 17365 "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 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17281 "PhotoPage.c"
+#line 17371 "PhotoPage.c"
 			default:
 			{
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17288 "PhotoPage.c"
+#line 17378 "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 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17294 "PhotoPage.c"
+#line 17384 "PhotoPage.c"
 			default:
 			{
-#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17301 "PhotoPage.c"
+#line 17391 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17307 "PhotoPage.c"
+#line 17397 "PhotoPage.c"
 			default:
 			{
-#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17314 "PhotoPage.c"
+#line 17404 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17320 "PhotoPage.c"
+#line 17410 "PhotoPage.c"
 			default:
 			{
-#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17327 "PhotoPage.c"
+#line 17417 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17333 "PhotoPage.c"
+#line 17423 "PhotoPage.c"
 			default:
 			{
-#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17340 "PhotoPage.c"
+#line 17430 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17346 "PhotoPage.c"
+#line 17436 "PhotoPage.c"
 			default:
 			{
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17353 "PhotoPage.c"
+#line 17443 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17359 "PhotoPage.c"
+#line 17449 "PhotoPage.c"
 			default:
 			{
-#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17366 "PhotoPage.c"
+#line 17456 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17372 "PhotoPage.c"
+#line 17462 "PhotoPage.c"
 			default:
 			{
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17379 "PhotoPage.c"
+#line 17469 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17385 "PhotoPage.c"
+#line 17475 "PhotoPage.c"
 			default:
 			{
-#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17392 "PhotoPage.c"
+#line 17482 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17398 "PhotoPage.c"
+#line 17488 "PhotoPage.c"
 			default:
 			{
-#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17405 "PhotoPage.c"
+#line 17495 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17411 "PhotoPage.c"
+#line 17501 "PhotoPage.c"
 			default:
 			{
-#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17418 "PhotoPage.c"
+#line 17508 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17424 "PhotoPage.c"
+#line 17514 "PhotoPage.c"
 			default:
 			{
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17431 "PhotoPage.c"
+#line 17521 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17437 "PhotoPage.c"
+#line 17527 "PhotoPage.c"
 			default:
 			{
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17444 "PhotoPage.c"
+#line 17534 "PhotoPage.c"
 			}
 		}
 	}
-#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = handled;
-#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17452 "PhotoPage.c"
+#line 17542 "PhotoPage.c"
 }
 
 
@@ -17464,44 +17554,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	GtkWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
 	FullscreenWindow* _tmp2_ = NULL;
-#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17475 "PhotoPage.c"
+#line 17565 "PhotoPage.c"
 	}
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
-#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fs;
-#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17485 "PhotoPage.c"
+#line 17575 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
-#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
-#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17492 "PhotoPage.c"
+#line 17582 "PhotoPage.c"
 	}
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17500 "PhotoPage.c"
+#line 17590 "PhotoPage.c"
 }
 
 
@@ -17511,33 +17601,33 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	gboolean _tmp0_ = FALSE;
 	GdkEventButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_to_collection_on_release;
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = FALSE;
-#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17526 "PhotoPage.c"
+#line 17616 "PhotoPage.c"
 	}
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/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 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17536 "PhotoPage.c"
+#line 17626 "PhotoPage.c"
 }
 
 
@@ -17546,13 +17636,13 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp7_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
-#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17551 "PhotoPage.c"
+#line 17641 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		GObject* _tmp2_ = NULL;
@@ -17560,41 +17650,41 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		GMenuModel* _tmp4_ = NULL;
 		GtkMenu* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu");
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/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 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		model = _tmp3_;
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = model;
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp5_);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->context_menu = _tmp5_;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->context_menu;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/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 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17583 "PhotoPage.c"
+#line 17673 "PhotoPage.c"
 	}
-#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
-#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17593 "PhotoPage.c"
+#line 17683 "PhotoPage.c"
 }
 
 
@@ -17604,25 +17694,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp2_ = NULL;
-#line 2827 "/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 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2828 "/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 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2828 "/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_, _tmp2_);
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17621 "PhotoPage.c"
+#line 17711 "PhotoPage.c"
 }
 
 
@@ -17631,59 +17721,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17644 "PhotoPage.c"
+#line 17734 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	CollectionPage* _tmp0_ = NULL;
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17656 "PhotoPage.c"
+#line 17746 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
-#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
-#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->return_page;
-#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
-#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17670 "PhotoPage.c"
+#line 17760 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp5_);
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17682 "PhotoPage.c"
+#line 17772 "PhotoPage.c"
 	}
 }
 
@@ -17695,29 +17785,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/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 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2867 "/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 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _ ("Remove From Library");
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("Removing Photo From Library");
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	remove_from_app (photos, _tmp2_, _tmp3_);
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17716 "PhotoPage.c"
+#line 17806 "PhotoPage.c"
 }
 
 
@@ -17742,64 +17832,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	TrashUntrashPhotosCommand* _tmp26_ = NULL;
 	LibraryWindow* _tmp27_ = NULL;
 	LibraryWindow* _tmp28_ = NULL;
-#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/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 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17749 "PhotoPage.c"
+#line 17839 "PhotoPage.c"
 	}
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17755 "PhotoPage.c"
+#line 17845 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17766 "PhotoPage.c"
+#line 17856 "PhotoPage.c"
 	}
-#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/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 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2888 "/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 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photos;
-#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (_tmp6_, _tmp7_);
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2892 "/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 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = photo;
-#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/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 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/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 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17798 "PhotoPage.c"
+#line 17888 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -17807,88 +17897,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		gboolean _tmp17_ = FALSE;
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp14_, TRUE);
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
-#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17824 "PhotoPage.c"
+#line 17914 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
-#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			fullscreen_window_close (_tmp19_);
-#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17835 "PhotoPage.c"
+#line 17925 "PhotoPage.c"
 		}
-#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17845 "PhotoPage.c"
+#line 17935 "PhotoPage.c"
 	}
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = photos;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp23_);
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = library_window_get_app ();
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = _tmp27_;
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_window_set_page_switching_enabled (_tmp28_, TRUE);
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp28_);
-#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17875 "PhotoPage.c"
+#line 17965 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/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 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17887 "PhotoPage.c"
+#line 17977 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -17902,62 +17992,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		gboolean _tmp10_ = FALSE;
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2913 "/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 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_list = _tmp1_;
-#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo_list;
-#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/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 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/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 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_list;
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/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 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 17941 "PhotoPage.c"
+#line 18031 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
 	DataSource* _tmp0_ = NULL;
-#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2921 "/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 17956 "PhotoPage.c"
+#line 18046 "PhotoPage.c"
 }
 
 
@@ -17979,100 +18069,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	Photo* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 17988 "PhotoPage.c"
+#line 18078 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/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 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/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 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp5_;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18006 "PhotoPage.c"
+#line 18096 "PhotoPage.c"
 	}
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18012 "PhotoPage.c"
+#line 18102 "PhotoPage.c"
 	}
-#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/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 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp6_;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = view;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = photo;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/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 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/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 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = photo;
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/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 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/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 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18056 "PhotoPage.c"
+#line 18146 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18067 "PhotoPage.c"
+#line 18157 "PhotoPage.c"
 	}
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18071 "PhotoPage.c"
+#line 18161 "PhotoPage.c"
 }
 
 
@@ -18081,48 +18171,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18094 "PhotoPage.c"
+#line 18184 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18121 "PhotoPage.c"
+#line 18211 "PhotoPage.c"
 	}
 }
 
@@ -18130,55 +18220,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 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2949 "/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 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18135 "PhotoPage.c"
+#line 18225 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/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 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18154 "PhotoPage.c"
+#line 18244 "PhotoPage.c"
 	} else {
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18158 "PhotoPage.c"
+#line 18248 "PhotoPage.c"
 	}
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18162 "PhotoPage.c"
+#line 18252 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/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 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18177 "PhotoPage.c"
+#line 18267 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -18187,39 +18277,39 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		Photo* _tmp4_ = NULL;
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/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 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_external_editor (_tmp4_, &_inner_error_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18204 "PhotoPage.c"
-			goto __catch248_g_error;
+#line 18294 "PhotoPage.c"
+			goto __catch250_g_error;
 		}
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18215 "PhotoPage.c"
+#line 18305 "PhotoPage.c"
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_ = NULL;
@@ -18227,42 +18317,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		GError* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		Photo* _tmp11_ = NULL;
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = err;
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/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 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		open_external_editor_error_dialog (_tmp9_, _tmp11_);
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18250 "PhotoPage.c"
+#line 18340 "PhotoPage.c"
 	}
-	__finally248:
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally250:
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/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 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18261 "PhotoPage.c"
+#line 18351 "PhotoPage.c"
 	}
 }
 
@@ -18274,31 +18364,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	PhotoFileFormat _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/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 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18281 "PhotoPage.c"
+#line 18371 "PhotoPage.c"
 	}
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/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 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_master_file_format (_tmp2_);
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18297 "PhotoPage.c"
+#line 18387 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -18307,39 +18397,39 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		Photo* _tmp8_ = NULL;
 		AppWindow* _tmp9_ = NULL;
 		AppWindow* _tmp10_ = NULL;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/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 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18324 "PhotoPage.c"
-			goto __catch249_g_error;
+#line 18414 "PhotoPage.c"
+			goto __catch251_g_error;
 		}
-#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
-#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18335 "PhotoPage.c"
+#line 18425 "PhotoPage.c"
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -18347,74 +18437,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = app_window_get_instance ();
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = err;
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp15_);
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18370 "PhotoPage.c"
+#line 18460 "PhotoPage.c"
 	}
-	__finally249:
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally251:
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/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 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18381 "PhotoPage.c"
+#line 18471 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2986 "/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 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18394 "PhotoPage.c"
+#line 18484 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18413 "PhotoPage.c"
+#line 18503 "PhotoPage.c"
 	}
 }
 
@@ -18446,85 +18536,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	gint _tmp17_ = 0;
 	Scaling _tmp18_ = {0};
 	GError * _inner_error_ = NULL;
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/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 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18453 "PhotoPage.c"
+#line 18543 "PhotoPage.c"
 	}
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = export_dialog_new (_tmp1_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_dialog = _tmp2_;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_format_parameters_last (&_tmp3_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_params = _tmp3_;
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = export_dialog;
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale = _tmp5_;
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	constraint = _tmp6_;
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp7_) {
-#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18481 "PhotoPage.c"
+#line 18571 "PhotoPage.c"
 	}
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/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 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = export_params;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = export_ui_choose_file (_tmp12_);
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	save_as = _tmp14_;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = save_as;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_ == NULL) {
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18513 "PhotoPage.c"
+#line 18603 "PhotoPage.c"
 	}
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = scale;
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 18523 "PhotoPage.c"
+#line 18613 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -18540,48 +18630,48 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		ExportFormatMode _tmp30_ = 0;
 		ExportFormatParameters _tmp31_ = {0};
 		gboolean _tmp32_ = FALSE;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/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 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = save_as;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = scaling;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = export_params;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_.quality;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/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 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = export_params;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = export_params;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_.mode;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = export_params;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = _tmp31_.export_metadata;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18575 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 18665 "PhotoPage.c"
+			goto __catch252_g_error;
 		}
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp33_ = NULL;
@@ -18592,56 +18682,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		const gchar* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _ ("Unable to export %s: %s");
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = save_as;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = g_file_get_path (_tmp34_);
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp35_;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = err;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_->message;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = _tmp39_;
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp40_, NULL);
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp40_);
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp36_);
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18619 "PhotoPage.c"
+#line 18709 "PhotoPage.c"
 	}
-	__finally250:
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally252:
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/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 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18634 "PhotoPage.c"
+#line 18724 "PhotoPage.c"
 	}
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18640 "PhotoPage.c"
+#line 18730 "PhotoPage.c"
 }
 
 
@@ -18650,40 +18740,40 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3001 "/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 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18663 "PhotoPage.c"
+#line 18753 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18682 "PhotoPage.c"
+#line 18772 "PhotoPage.c"
 	}
 }
 
@@ -18699,56 +18789,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/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 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18706 "PhotoPage.c"
+#line 18796 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/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 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18713 "PhotoPage.c"
+#line 18803 "PhotoPage.c"
 	}
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18719 "PhotoPage.c"
+#line 18809 "PhotoPage.c"
 	}
-#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/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 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/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 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18747 "PhotoPage.c"
+#line 18837 "PhotoPage.c"
 }
 
 
@@ -18763,56 +18853,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/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 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18770 "PhotoPage.c"
+#line 18860 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/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 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18777 "PhotoPage.c"
+#line 18867 "PhotoPage.c"
 	}
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18783 "PhotoPage.c"
+#line 18873 "PhotoPage.c"
 	}
-#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/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 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/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 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18811 "PhotoPage.c"
+#line 18901 "PhotoPage.c"
 }
 
 
@@ -18828,121 +18918,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	CommandManager* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	SetRatingSingleCommand* _tmp10_ = NULL;
-#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/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 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18835 "PhotoPage.c"
+#line 18925 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/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 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18842 "PhotoPage.c"
+#line 18932 "PhotoPage.c"
 	}
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18848 "PhotoPage.c"
+#line 18938 "PhotoPage.c"
 	}
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/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 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = rating;
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/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 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp7_;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = command;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp9_);
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18878 "PhotoPage.c"
+#line 18968 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
-#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18887 "PhotoPage.c"
+#line 18977 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
-#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18896 "PhotoPage.c"
+#line 18986 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18905 "PhotoPage.c"
+#line 18995 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 18914 "PhotoPage.c"
+#line 19004 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
-#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 18923 "PhotoPage.c"
+#line 19013 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
-#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 18932 "PhotoPage.c"
+#line 19022 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
-#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 18941 "PhotoPage.c"
+#line 19031 "PhotoPage.c"
 }
 
 
@@ -18976,117 +19066,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	Photo* _tmp26_ = NULL;
 	Rating _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/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 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3066 "/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), "RateRejected", _tmp2_ != RATING_REJECTED);
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/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 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3067 "/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), "RateUnrated", _tmp5_ != RATING_UNRATED);
-#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/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 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3068 "/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), "RateOne", _tmp8_ != RATING_ONE);
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/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 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/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 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/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 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/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 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/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 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/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 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/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 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/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 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/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 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = rating_can_increase (_tmp23_);
-#line 3073 "/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), "IncreaseRating", _tmp24_);
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp22_);
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/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 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = rating_can_decrease (_tmp27_);
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19071 "PhotoPage.c"
+#line 19161 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new18 (const gchar* value) {
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19078 "PhotoPage.c"
+#line 19168 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new19 (const gchar* value) {
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19085 "PhotoPage.c"
+#line 19175 "PhotoPage.c"
 }
 
 
@@ -19098,98 +19188,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat _tmp4_ = 0;
 	PhotoFileFormat _tmp5_ = 0;
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/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 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	format = _tmp3_;
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = format;
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3096 "/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 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = format;
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19119 "PhotoPage.c"
+#line 19209 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		RawDeveloper _tmp8_ = 0;
 		RawDeveloper _tmp9_ = 0;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/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 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = photo_get_raw_developer (_tmp7_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (_tmp9_) {
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19138 "PhotoPage.c"
+#line 19228 "PhotoPage.c"
 			{
 				GAction* _tmp10_ = NULL;
 				GAction* _tmp11_ = NULL;
 				GVariant* _tmp12_ = NULL;
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = _tmp10_;
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = _variant_new18 ("Shotwell");
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp11_, _tmp12_);
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp12_);
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19157 "PhotoPage.c"
+#line 19247 "PhotoPage.c"
 			}
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19163 "PhotoPage.c"
+#line 19253 "PhotoPage.c"
 			{
 				GAction* _tmp13_ = NULL;
 				GAction* _tmp14_ = NULL;
 				GVariant* _tmp15_ = NULL;
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp14_ = _tmp13_;
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp15_ = _variant_new19 ("Camera");
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp14_, _tmp15_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp15_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp14_);
-#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19182 "PhotoPage.c"
+#line 19272 "PhotoPage.c"
 			}
 			default:
 			{
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19188 "PhotoPage.c"
+#line 19278 "PhotoPage.c"
 			}
 		}
 	}
@@ -19203,60 +19293,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/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 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19220 "PhotoPage.c"
+#line 19310 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		Alteration* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/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 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = (Alteration*) _tmp9_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp11_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_alteration_unref0 (_tmp10_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19245 "PhotoPage.c"
+#line 19335 "PhotoPage.c"
 	} else {
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19249 "PhotoPage.c"
+#line 19339 "PhotoPage.c"
 	}
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19255 "PhotoPage.c"
+#line 19345 "PhotoPage.c"
 	}
 }
 
@@ -19272,29 +19362,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp0_;
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = dialog;
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = _tmp3_;
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names_length1 = _tmp2_;
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_names_size_ = names_length1;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = names;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = names_length1;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19293 "PhotoPage.c"
+#line 19383 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -19311,57 +19401,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		GeeCollection* _tmp16_ = NULL;
 		AddTagsCommand* _tmp17_ = NULL;
 		AddTagsCommand* _tmp18_ = NULL;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = hierarchical_tag_index_get_global_index ();
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = names;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9__length1 = names_length1;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12__length1 = _tmp10_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp8_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19354 "PhotoPage.c"
+#line 19444 "PhotoPage.c"
 	}
-#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19360 "PhotoPage.c"
+#line 19450 "PhotoPage.c"
 }
 
 
@@ -19386,77 +19476,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp14_ = NULL;
 	ModifyTagsCommand* _tmp15_ = NULL;
 	ModifyTagsCommand* _tmp16_ = NULL;
-#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_at (_tmp1_, 0);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = data_view_get_source (_tmp3_);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp5_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photo;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp7_;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = dialog;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = modify_tags_dialog_execute (_tmp8_);
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_tags = _tmp9_;
-#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = new_tags;
-#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (new_tags);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19429 "PhotoPage.c"
+#line 19519 "PhotoPage.c"
 	}
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_tags;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/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 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_tags);
-#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19455 "PhotoPage.c"
+#line 19545 "PhotoPage.c"
 }
 
 
@@ -19488,7 +19578,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	result = _tmp4_;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19487 "PhotoPage.c"
+#line 19577 "PhotoPage.c"
 }
 
 
@@ -19498,14 +19588,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
 #line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19497 "PhotoPage.c"
+#line 19587 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
 #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 19504 "PhotoPage.c"
+#line 19594 "PhotoPage.c"
 }
 
 
@@ -19514,7 +19604,7 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19513 "PhotoPage.c"
+#line 19603 "PhotoPage.c"
 }
 
 
@@ -19544,6 +19634,8 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 #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)->remove_actions = library_photo_page_real_remove_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 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->update_actions = library_photo_page_real_update_actions;
@@ -19552,6 +19644,8 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switched_to = library_photo_page_real_switched_to;
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	((PageClass *) klass)->switching_from = library_photo_page_real_switching_from;
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket;
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket;
@@ -19577,7 +19671,7 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 	((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress;
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19576 "PhotoPage.c"
+#line 19670 "PhotoPage.c"
 }
 
 
@@ -19593,7 +19687,7 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
 #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19592 "PhotoPage.c"
+#line 19686 "PhotoPage.c"
 }
 
 
@@ -19634,11 +19728,11 @@ static void library_photo_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->return_page);
 #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_view_filter_unref0 (self->priv->filter);
-#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2831 "/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 19637 "PhotoPage.c"
+#line 19731 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index a6fb529..962c80e 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2431,17 +2431,26 @@ public class LibraryPhotoPage : EditingHostPage {
         { "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 ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
         (get_action ("ViewRatings") as GLib.SimpleAction).change_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.change_state (d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
+        var action = new GLib.SimpleAction.stateful("RawDeveloper",
+                GLib.VariantType.STRING, d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
+        action.change_state.connect(on_raw_developer_changed);
+        action.set_enabled(true);
+        map.add_action(action);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     protected override InjectionGroup[] init_collect_injection_groups() {
@@ -2573,7 +2582,7 @@ public class LibraryPhotoPage : EditingHostPage {
     }
     
     // Displays a photo from a specific CollectionPage.  When the user exits this view,
-    // they will be sent back to the return_page. The optional view paramters is for using
+    // they will be sent back to the return_page. The optional view parameters is for using
     // a ViewCollection other than the one inside return_page; this is necessary if the 
     // view and return_page have different filters.
     public void display_for_collection(CollectionPage return_page, Photo photo, 
@@ -2608,6 +2617,14 @@ public class LibraryPhotoPage : EditingHostPage {
         
         set_display_ratings(Config.Facade.get_instance().get_display_photo_ratings());
     }
+
+
+    public override void switching_from() {
+        base.switching_from();
+        foreach (var entry in entries) {
+            AppWindow.get_instance().remove_action(entry.name);
+        }
+    }
     
     protected override Gdk.Pixbuf? get_bottom_left_trinket(int scale) {
         if (!has_photo() || !Config.Facade.get_instance().get_display_photo_ratings())
@@ -3123,6 +3140,5 @@ public class LibraryPhotoPage : EditingHostPage {
         
         get_command_manager().execute(new ModifyTagsCommand(photo, new_tags));
     }
-
 }
 
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 540a79f..cc407c0 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.32.1, the Vala compiler
+/* PixbufCache.c generated by valac 0.34.4, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2288,7 +2288,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2291 "PixbufCache.c"
-			goto __catch450_g_error;
+			goto __catch452_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2302,8 +2302,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2304 "PixbufCache.c"
 	}
-	goto __finally450;
-	__catch450_g_error:
+	goto __finally452;
+	__catch452_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2324,7 +2324,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2326 "PixbufCache.c"
 	}
-	__finally450:
+	__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"
@@ -2427,7 +2427,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2430 "PixbufCache.c"
-			goto __catch451_g_error;
+			goto __catch453_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2441,8 +2441,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2443 "PixbufCache.c"
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally453;
+	__catch453_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2463,7 +2463,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2465 "PixbufCache.c"
 	}
-	__finally451:
+	__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"
@@ -2510,7 +2510,7 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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_TYPE_PIXBUF, G_TYPE_POINTER);
+	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 2515 "PixbufCache.c"
 }
 
@@ -2522,7 +2522,7 @@ static void pixbuf_cache_instance_init (PixbufCache * self) {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv = PIXBUF_CACHE_GET_PRIVATE (self);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->cache = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala"
diff --git a/src/Printing.c b/src/Printing.c
index 70750fa..3d74121 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -1,4 +1,4 @@
-/* Printing.c generated by valac 0.32.1, the Vala compiler
+/* Printing.c generated by valac 0.34.4, the Vala compiler
  * generated from Printing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2944,15 +2944,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2958 "Printing.c"
 }
@@ -3433,15 +3433,15 @@ static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
 	const gchar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3447 "Printing.c"
 }
@@ -3503,17 +3503,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3519 "Printing.c"
 }
@@ -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 __catch465_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 __finally465;
-	__catch465_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"
 	}
-	__finally465:
+	__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 __catch466_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 __catch466_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 __finally466;
-	__catch466_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"
 	}
-	__finally466:
+	__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/Printing.vala b/src/Printing.vala
index f099ed2..d5a84e5 100644
--- a/src/Printing.vala
+++ b/src/Printing.vala
@@ -164,7 +164,7 @@ public class PrintSettings {
 
 /* we define our own measurement enum instead of using the Gtk.Unit enum
    provided by Gtk+ 2.0 because Gtk.Unit doesn't define a CENTIMETERS
-   constant (thout it does define an MM for millimeters). This is
+   constant (though it does define an MM for millimeters). This is
    unfortunate, because in metric countries people like to think about
    paper sizes for printing in CM not MM. so, to avoid having to
    multiply and divide everything by 10 (which is error prone) to convert
diff --git a/src/Properties.c b/src/Properties.c
index 1b97778..4acfb1b 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.32.1, the Vala compiler
+/* Properties.c generated by valac 0.34.4, the Vala compiler
  * generated from Properties.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1015,35 +1015,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1049 "Properties.c"
 }
@@ -1053,15 +1053,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1067 "Properties.c"
 }
@@ -1074,37 +1074,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1090 "Properties.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1098 "Properties.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1110 "Properties.c"
 	}
@@ -1124,112 +1124,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1134 "Properties.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1140 "Properties.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1144 "Properties.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1148 "Properties.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1160 "Properties.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1170 "Properties.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1176 "Properties.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1190 "Properties.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1200 "Properties.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1206 "Properties.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1215 "Properties.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1235 "Properties.c"
 }
@@ -1342,13 +1342,13 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 1354 "Properties.c"
 }
@@ -4512,7 +4512,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4515 "Properties.c"
-				goto __catch430_g_error;
+				goto __catch432_g_error;
 			}
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4526,8 +4526,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_media_metadata_unref0 (_tmp20_);
 #line 4528 "Properties.c"
 		}
-		goto __finally430;
-		__catch430_g_error:
+		goto __finally432;
+		__catch432_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_ = NULL;
@@ -4548,7 +4548,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_error_free0 (e);
 #line 4550 "Properties.c"
 		}
-		__finally430:
+		__finally432:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4802,11 +4802,11 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 4812 "Properties.c"
 	{
@@ -4821,98 +4821,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4843 "Properties.c"
-				goto __catch431_g_regex_error;
+				goto __catch433_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4852 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4868 "Properties.c"
-				goto __catch431_g_regex_error;
+				goto __catch433_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4879 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 4893 "Properties.c"
 	}
-	goto __finally431;
-	__catch431_g_regex_error:
+	goto __finally433;
+	__catch433_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 4907 "Properties.c"
 	}
-	__finally431:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__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.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 4918 "Properties.c"
 	}
diff --git a/src/Resources.c b/src/Resources.c
index 3a59fbe..1682cda 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.32.1, the Vala compiler
+/* Resources.c generated by valac 0.34.4, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -201,8 +201,8 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_ADJUST "image-adjust"
 #define RESOURCES_PIN_TOOLBAR "shotwell-pin-toolbar"
 #define RESOURCES_MAKE_PRIMARY "shotwell-make-primary"
-#define RESOURCES_IMPORT "shotwell-import"
-#define RESOURCES_IMPORT_ALL "shotwell-import-all"
+#define RESOURCES_IMPORT "import"
+#define RESOURCES_IMPORT_ALL "import-all"
 #define RESOURCES_ENHANCE "shotwell-auto-enhance"
 #define RESOURCES_CROP_PIVOT_RETICLE "shotwell-crop-pivot-reticle"
 #define RESOURCES_PUBLISH "applications-internet"
@@ -2718,7 +2718,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 #line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2693 "Resources.c"
-				goto __catch426_g_error;
+				goto __catch428_g_error;
 			}
 #line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = _tmp1_;
@@ -2732,8 +2732,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_object_unref0 (_tmp1_);
 #line 2706 "Resources.c"
 		}
-		goto __finally426;
-		__catch426_g_error:
+		goto __finally428;
+		__catch428_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp13_ = NULL;
@@ -2750,7 +2750,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_error_free0 (err);
 #line 2723 "Resources.c"
 		}
-		__finally426:
+		__finally428:
 #line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 840 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2899,7 +2899,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 2871 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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 870 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
 #line 870 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2980,7 +2980,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 2952 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
 #line 888 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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 888 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
 #line 888 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3075,7 +3075,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 #line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3049 "Resources.c"
-			goto __catch427_g_error;
+			goto __catch429_g_error;
 		}
 #line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = _tmp4_;
@@ -3089,8 +3089,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp4_);
 #line 3062 "Resources.c"
 	}
-	goto __finally427;
-	__catch427_g_error:
+	goto __finally429;
+	__catch429_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -3112,7 +3112,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_error_free0 (err);
 #line 3085 "Resources.c"
 	}
-	__finally427:
+	__finally429:
 #line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3632,11 +3632,11 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 #line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3606 "Resources.c"
-			goto __catch428_g_error;
+			goto __catch430_g_error;
 		}
 	}
-	goto __finally428;
-	__catch428_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -3662,7 +3662,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		return;
 #line 3635 "Resources.c"
 	}
-	__finally428:
+	__finally430:
 #line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "/home/jens/Source/shotwell/src/Resources.vala"
diff --git a/src/Resources.vala b/src/Resources.vala
index d7f237c..feb568b 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -76,8 +76,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ADJUST = "image-adjust";
     public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
     public const string MAKE_PRIMARY = "shotwell-make-primary";
-    public const string IMPORT = "shotwell-import";
-    public const string IMPORT_ALL = "shotwell-import-all";
+    public const string IMPORT = "import";
+    public const string IMPORT_ALL = "import-all";
     public const string ENHANCE = "shotwell-auto-enhance";
     public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
     public const string PUBLISH = "applications-internet";
diff --git a/src/Screensaver.c b/src/Screensaver.c
index 50ae28a..1c0f1f8 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.32.1, the Vala compiler
+/* Screensaver.c generated by valac 0.34.4, the Vala compiler
  * generated from Screensaver.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index d439603..6d1e92f 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1,4 +1,4 @@
-/* SearchFilter.c generated by valac 0.32.1, the Vala compiler
+/* SearchFilter.c generated by valac 0.34.4, the Vala compiler
  * generated from SearchFilter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2232,17 +2232,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2248 "SearchFilter.c"
 }
@@ -4910,56 +4910,56 @@ void search_filter_actions_unref (gpointer instance) {
 
 
 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 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/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 4916 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
 #line 4923 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
 #line 4930 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
 #line 4937 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
 #line 4944 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
 #line 4951 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
 #line 4958 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
-#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
 #line 4965 "SearchFilter.c"
 }
@@ -4968,7 +4968,7 @@ static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_cri
 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 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
 #line 4974 "SearchFilter.c"
 }
@@ -4982,14 +4982,14 @@ static gpointer _search_filter_actions_ref0 (gpointer self) {
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
 #line 4988 "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 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
 #line 4995 "SearchFilter.c"
 }
@@ -5109,47 +5109,47 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_g_object_unref0 (self->priv->toolbar);
 #line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbar = _tmp2_;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = actions;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1055 "/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 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = actions;
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter_actions_get_text (_tmp4_);
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _tmp5_;
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = search_filter_toolbar_search_box_new (_tmp6_);
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_box);
-#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_box = _tmp7_;
-#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->toolbar;
-#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1058 "/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 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->priv->toolbar;
-#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
 #line 5139 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->builder;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/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"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5148 "SearchFilter.c"
-			goto __catch588_g_error;
+			goto __catch590_g_error;
 		}
 	}
-	goto __finally588;
-	__catch588_g_error:
+	goto __finally590;
+	__catch590_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -5157,334 +5157,334 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		err = _inner_error_;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_inner_error_ = NULL;
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = _ ("Error loading search bar UI: %s");
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp12_ = err;
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp13_ = _tmp12_->message;
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp14_ = g_strdup_printf (_tmp11_, _tmp13_);
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp15_ = _tmp14_;
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		app_window_panic (_tmp15_);
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (_tmp15_);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
 #line 5181 "SearchFilter.c"
 	}
-	__finally588:
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	__finally590:
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/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 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_clear_error (&_inner_error_);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
 #line 5192 "SearchFilter.c"
 	}
-#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = self->priv->close_item;
-#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = _ ("Close");
-#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_menu_item_set_label (_tmp16_, _tmp17_);
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = self->priv->close_item;
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1074 "/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"
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp19_ = self->priv->close_item;
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1075 "/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"
+#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp20_ = self->priv->close_menu;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp21_ = self->priv->close_item;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1076 "/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"
+#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp22_ = _ ("Type");
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1079 "/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"
+#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp23_);
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
-#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->label_type = _tmp23_;
-#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp24_ = self->priv->toolbar;
-#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp25_ = self->priv->label_type;
-#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1080 "/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"
+#line 1082 "/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"
+#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp26_);
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbtn_photos = _tmp26_;
-#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp27_ = self->priv->toolbtn_photos;
-#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp28_ = _ ("Photos");
-#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1083 "/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"
+#line 1085 "/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"
+#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp29_);
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbtn_videos = _tmp29_;
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp30_ = self->priv->toolbtn_videos;
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp31_ = _ ("Videos");
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1086 "/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"
+#line 1088 "/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"
+#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp32_);
-#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
-#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbtn_raw = _tmp32_;
-#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp33_ = self->priv->toolbtn_raw;
-#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp34_ = _ ("RAW Photos");
-#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1089 "/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"
+#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp35_ = self->priv->toolbar;
-#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp36_ = self->priv->toolbtn_photos;
-#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1091 "/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"
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp37_ = self->priv->toolbar;
-#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp38_ = self->priv->toolbtn_videos;
-#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1092 "/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"
+#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp39_ = self->priv->toolbar;
-#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp40_ = self->priv->toolbtn_raw;
-#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1093 "/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"
+#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp41_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp41_);
-#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
-#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->sepr_mediatype_flagged = _tmp41_;
-#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp42_ = self->priv->toolbar;
-#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp43_ = self->priv->sepr_mediatype_flagged;
-#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1097 "/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"
+#line 1101 "/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"
+#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp44_);
-#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
-#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbtn_flag = _tmp44_;
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp45_ = self->priv->toolbtn_flag;
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp46_ = _ ("Flagged");
-#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1102 "/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"
+#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp47_ = self->priv->toolbtn_flag;
-#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp48_ = _ ("Flagged");
-#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1103 "/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"
+#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp49_ = self->priv->toolbar;
-#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp50_ = self->priv->toolbtn_flag;
-#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1105 "/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"
+#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp51_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp51_);
-#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
-#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->sepr_flagged_rating = _tmp51_;
-#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp52_ = self->priv->toolbar;
-#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp53_ = self->priv->sepr_flagged_rating;
-#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1109 "/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"
+#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp54_ = self->builder;
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp55_ = gtk_builder_get_object (_tmp54_, "popup-menu");
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1112 "/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"
+#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	model = _tmp56_;
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1113 "/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"
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp57_);
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->rating_button);
-#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->rating_button = _tmp57_;
-#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp58_ = self->priv->rating_button;
-#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp59_ = _ ("Rating");
-#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1114 "/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"
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp60_ = self->priv->rating_button;
-#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1115 "/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"
+#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp61_ = self->priv->toolbar;
-#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp62_ = self->priv->rating_button;
-#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1116 "/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"
+#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp63_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp63_);
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->sepr_rating_saved = _tmp63_;
-#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp64_ = self->priv->toolbar;
-#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp65_ = self->priv->sepr_rating_saved;
-#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1120 "/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"
+#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp66_ = self->priv->saved_search_button;
-#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1123 "/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"
+#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp67_ = self->priv->saved_search_button;
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp68_ = _ ("Saved Search");
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1124 "/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"
+#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp69_ = self->priv->saved_search_button;
-#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1125 "/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"
+#line 1125 "/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"
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp71_ = self->priv->saved_search_button;
-#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1126 "/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"
+#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp72_ = self->priv->toolbar;
-#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp73_ = self->priv->saved_search_button;
-#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1127 "/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"
+#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp74_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp74_);
-#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	separator_align = _tmp74_;
-#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1131 "/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 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_separator_tool_item_set_draw (separator_align, FALSE);
-#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp75_ = self->priv->toolbar;
-#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1133 "/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"
+#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp76_ = self->priv->toolbar;
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->search_box;
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1136 "/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"
+#line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp78_ = self->priv->toolbar;
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1138 "/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"
+#line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp79_ = actions;
-#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1141 "/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"
+#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp80_ = actions;
-#line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1142 "/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"
+#line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp81_ = actions;
-#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1143 "/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"
+#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp82_ = actions;
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1144 "/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"
+#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp83_ = actions;
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1145 "/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"
+#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp84_ = actions;
-#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1146 "/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"
+#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp85_ = actions;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1147 "/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"
+#line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp86_ = self->priv->toolbar;
-#line 1151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1150 "/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"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp87_ = actions;
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp88_ = search_filter_actions_get_has_photos (_tmp87_);
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp89_ = actions;
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp90_ = search_filter_actions_get_has_videos (_tmp89_);
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp91_ = actions;
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp92_ = search_filter_actions_get_has_raw (_tmp91_);
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = actions;
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp94_ = search_filter_actions_get_has_flagged (_tmp93_);
-#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1152 "/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);
@@ -5508,81 +5508,81 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = has_photos;
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
 #line 5518 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = self->priv->toolbtn_photos;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
 #line 5524 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
-#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
-#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
 #line 5531 "SearchFilter.c"
 	}
-#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = has_videos;
-#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
 #line 5537 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
-#line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_videos;
-#line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
 #line 5543 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
 #line 5550 "SearchFilter.c"
 	}
-#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = has_raw;
-#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
 #line 5556 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_raw;
-#line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
 #line 5562 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
 #line 5569 "SearchFilter.c"
 	}
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = has_flagged;
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp9_) {
 #line 5575 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_flag;
-#line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
 #line 5581 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = self->priv->toolbtn_flag;
-#line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
 #line 5588 "SearchFilter.c"
 	}
@@ -5594,26 +5594,26 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	GtkMenu* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	guint32 _tmp2_ = 0U;
-#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_TOOLBAR (self), FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->close_menu;
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = button;
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_get_current_event_time ();
-#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) _tmp1_, _tmp2_);
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
 #line 5612 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
-#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5619 "SearchFilter.c"
 }
@@ -5627,92 +5627,92 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	GAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1208 "/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"
+#line 1208 "/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"
+#line 1208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp3_;
-#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = action;
-#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
 #line 5649 "SearchFilter.c"
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
-#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = action;
-#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = _variant_new39 (FALSE);
-#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
-#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
 #line 5660 "SearchFilter.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
 #line 5666 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) {
-#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1218 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5675 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) {
-#line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5684 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) {
-#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5693 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
-#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5702 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self) {
-#line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5711 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5718 "SearchFilter.c"
 }
@@ -5727,68 +5727,68 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	GAction* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GSimpleAction* _tmp5_ = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ == NULL) {
-#line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (aw);
-#line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
 #line 5745 "SearchFilter.c"
 	}
-#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
-#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1244 "/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"
+#line 1244 "/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"
+#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp4_;
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = action;
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
 #line 5759 "SearchFilter.c"
 		GSimpleAction* _tmp6_ = NULL;
 		GVariant* _tmp7_ = NULL;
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = action;
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = _variant_new40 (TRUE);
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
 #line 5770 "SearchFilter.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
 #line 5778 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self) {
-#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1258 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5787 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
 #line 5794 "SearchFilter.c"
 }
@@ -5805,45 +5805,45 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	SearchFilterToolbarRatingFilterButton* _tmp7_ = NULL;
 	SearchViewFilter* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (search_filter));
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter;
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->search_filter;
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
 #line 5821 "SearchFilter.c"
 	}
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _view_filter_ref0 (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = _tmp3_;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_view_filter_get_criteria (_tmp5_);
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_set_sensitive_for_search_criteria (_tmp4_, (SearchFilterCriteria) _tmp6_);
-#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->rating_button;
-#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = search_filter;
-#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = search_view_filter_get_criteria (_tmp8_);
-#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/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 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 5849 "SearchFilter.c"
 }
@@ -5852,15 +5852,15 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
 	DisabledViewFilter* _tmp0_ = NULL;
 	DisabledViewFilter* _tmp1_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1275 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = disabled_view_filter_new ();
-#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1276 "/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 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
 #line 5866 "SearchFilter.c"
 }
@@ -5949,266 +5949,266 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	gboolean _tmp82_ = FALSE;
 	GtkSeparatorToolItem* _tmp93_ = NULL;
 	SearchViewFilter* _tmp94_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
 #line 5959 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = library_window_get_app ();
-#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp1_;
-#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		library_window_show_search_bar (_tmp2_, TRUE);
-#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
 #line 5970 "SearchFilter.c"
 	}
-#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
-#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_vala_assert (NULL != _tmp3_, "null != search_filter");
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_filter;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->actions;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_actions_get_text (_tmp5_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = text_action_get_value (_tmp7_);
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_;
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_search_filter (_tmp4_, _tmp9_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->search_filter;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->actions;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = search_filter_actions_get_flagged (_tmp11_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = _tmp12_;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/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"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _tmp14_;
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = g_variant_get_boolean (_tmp15_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_flagged (_tmp10_, _tmp16_);
-#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = self->priv->search_filter;
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = self->priv->actions;
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp19_ = search_filter_actions_get_videos (_tmp18_);
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp20_ = _tmp19_;
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/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"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp22_ = _tmp21_;
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp23_ = g_variant_get_boolean (_tmp22_);
-#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/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"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp22_);
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp24_ = self->priv->search_filter;
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp25_ = self->priv->actions;
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp26_ = search_filter_actions_get_photos (_tmp25_);
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp27_ = _tmp26_;
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/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"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp29_ = _tmp28_;
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp30_ = g_variant_get_boolean (_tmp29_);
-#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1292 "/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"
+#line 1292 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp29_);
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp31_ = self->priv->search_filter;
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp32_ = self->priv->actions;
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp33_ = search_filter_actions_get_raw (_tmp32_);
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp34_ = _tmp33_;
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/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"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp36_ = _tmp35_;
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp37_ = g_variant_get_boolean (_tmp36_);
-#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1294 "/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"
+#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp36_);
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp38_ = self->priv->actions;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp39_ = search_filter_actions_get_rating (_tmp38_);
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp40_ = _tmp39_;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/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"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp42_ = _tmp41_;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp43_ = g_variant_get_string (_tmp42_, NULL);
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = atoi (_tmp43_);
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp45_ = (RatingFilter) _tmp44_;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp42_);
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1296 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	filter = _tmp45_;
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp46_ = self->priv->search_filter;
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp47_ = filter;
-#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_rating_filter (_tmp46_, _tmp47_);
-#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp48_ = self->priv->rating_button;
-#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp49_ = filter;
-#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1298 "/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"
+#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp50_ = self->priv->search_filter;
-#line 1301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp51_ = self->priv->saved_search;
-#line 1301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1300 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_saved_search (_tmp50_, _tmp51_);
-#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp52_ = self->priv->actions;
-#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp53_ = search_filter_actions_get_criteria (_tmp52_);
-#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	criteria = _tmp53_;
-#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp54_ = self->priv->search_box;
-#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp55_ = criteria;
-#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1306 "/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"
+#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp56_ = self->priv->rating_button;
-#line 1309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp57_ = criteria;
-#line 1309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1308 "/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"
+#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp58_ = self->priv->toolbtn_flag;
-#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp59_ = criteria;
-#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1310 "/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"
+#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp60_ = self->priv->label_type;
-#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp61_ = criteria;
-#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1312 "/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"
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp62_ = self->priv->toolbtn_photos;
-#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp63_ = criteria;
-#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1313 "/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"
+#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp64_ = self->priv->toolbtn_videos;
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp65_ = criteria;
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1314 "/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"
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp66_ = self->priv->toolbtn_raw;
-#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp67_ = criteria;
-#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1315 "/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"
+#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp68_ = self->priv->saved_search_button;
-#line 1318 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp69_ = criteria;
-#line 1318 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1317 "/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"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp71_ = self->priv->label_type;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/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"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp73_ = _tmp72_;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
 #line 6162 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
 		gboolean _tmp76_ = FALSE;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp74_ = self->priv->toolbtn_flag;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/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"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp76_ = _tmp75_;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
 #line 6174 "SearchFilter.c"
 	} else {
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
 #line 6178 "SearchFilter.c"
 	}
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
-#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1321 "/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"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp80_ = self->priv->label_type;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/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"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp82_ = _tmp81_;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
 #line 6192 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
 		gboolean _tmp84_ = FALSE;
 		gboolean _tmp85_ = FALSE;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp83_ = self->priv->rating_button;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/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"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp85_ = _tmp84_;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
 #line 6204 "SearchFilter.c"
 	} else {
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
 #line 6208 "SearchFilter.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
 #line 6214 "SearchFilter.c"
 	} else {
@@ -6216,43 +6216,43 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
 		gboolean _tmp88_ = FALSE;
 		gboolean _tmp89_ = FALSE;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp87_ = self->priv->toolbtn_flag;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/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"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp89_ = _tmp88_;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
 #line 6228 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
 			gboolean _tmp91_ = FALSE;
 			gboolean _tmp92_ = FALSE;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp90_ = self->priv->rating_button;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/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"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp92_ = _tmp91_;
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
 #line 6240 "SearchFilter.c"
 		} else {
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
 #line 6244 "SearchFilter.c"
 		}
-#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
 #line 6248 "SearchFilter.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1323 "/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"
+#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp94_ = self->priv->search_filter;
-#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
 #line 6258 "SearchFilter.c"
 }
@@ -6261,32 +6261,32 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search) {
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (saved_search));
-#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = saved_search;
-#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = _tmp1_;
-#line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 6279 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self) {
-#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
 #line 6292 "SearchFilter.c"
 }
@@ -6298,25 +6298,25 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	SavedSearchDialog* ssd = NULL;
 	SavedSearch* _tmp2_ = NULL;
 	SavedSearchDialog* _tmp3_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = saved_search_dialog_new_edit_existing (_tmp2_);
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	ssd = _tmp3_;
-#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (ssd);
-#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
 #line 6322 "SearchFilter.c"
 }
@@ -6327,21 +6327,21 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
 	SavedSearch* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
-#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
 #line 6347 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
@@ -6349,21 +6349,21 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		SavedSearch* _tmp6_ = NULL;
 		DeleteSavedSearchCommand* _tmp7_ = NULL;
 		DeleteSavedSearchCommand* _tmp8_ = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = app_window_get_command_manager ();
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = _tmp4_;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = search;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = delete_saved_search_command_new (_tmp6_);
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = _tmp7_;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
 #line 6369 "SearchFilter.c"
 	}
@@ -6375,21 +6375,21 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
 	SavedSearchDialog* _tmp2_ = NULL;
 	SavedSearchDialog* _tmp3_ = NULL;
-#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = saved_search_dialog_new ();
-#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (_tmp3_);
-#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
 #line 6395 "SearchFilter.c"
 }
@@ -6400,56 +6400,56 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	SavedSearch* _tmp1_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp2_ = NULL;
 	SearchFilterToolbarSavedSearchPopover* _tmp3_ = NULL;
-#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = TRUE;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->saved_search;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_set_active (_tmp0_, _tmp1_ != NULL);
-#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->saved_search_button;
-#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_->filter_popup;
-#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
 #line 6420 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
 #line 6427 "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 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
 #line 6434 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
 #line 6441 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
 #line 6448 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
 #line 6455 "SearchFilter.c"
 }
@@ -6458,44 +6458,44 @@ static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved
 static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->elide_showing_again;
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
 #line 6468 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
 #line 6474 "SearchFilter.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
 #line 6478 "SearchFilter.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
 #line 6482 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
 #line 6489 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
-#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->saved_search = NULL;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = self->priv->saved_search_button;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
 #line 6501 "SearchFilter.c"
 		} else {
@@ -6516,11 +6516,11 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			SearchFilterToolbarSavedSearchPopover* _tmp34_ = NULL;
 			SearchFilterToolbarSavedSearchFilterButton* _tmp35_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp36_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = self->priv->saved_search_button;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp5_->filter_popup;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
 #line 6526 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
@@ -6538,98 +6538,98 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 				SearchFilterToolbarSavedSearchFilterButton* _tmp19_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp20_ = NULL;
 				guint _tmp21_ = 0U;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp7_ = self->priv->saved_search_button;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp8_ = _tmp7_->filter_popup;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp9_, NULL, FALSE);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/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 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp10_ = self->priv->saved_search_button;
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp11_ = _tmp10_->filter_popup;
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp12_, NULL, FALSE);
-#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/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 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp13_ = self->priv->saved_search_button;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp14_ = _tmp13_->filter_popup;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp15_, NULL, FALSE);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/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 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp16_ = self->priv->saved_search_button;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp17_ = _tmp16_->filter_popup;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp18_, NULL, FALSE);
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/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 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp19_ = self->priv->saved_search_button;
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp20_ = _tmp19_->filter_popup;
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/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 6582 "SearchFilter.c"
 			}
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp23_ = self->priv->saved_search_button;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/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 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_search_filter_toolbar_saved_search_popover_unref0 (_tmp22_->filter_popup);
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_->filter_popup = _tmp24_;
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp25_ = self->priv->saved_search_button;
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = _tmp25_->filter_popup;
-#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/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 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp27_ = self->priv->saved_search_button;
-#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = _tmp27_->filter_popup;
-#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/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 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp29_ = self->priv->saved_search_button;
-#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp30_ = _tmp29_->filter_popup;
-#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/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 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = self->priv->saved_search_button;
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = _tmp31_->filter_popup;
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/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 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = self->priv->saved_search_button;
-#line 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = _tmp33_->filter_popup;
-#line 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/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 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp35_ = self->priv->saved_search_button;
-#line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp36_ = _tmp35_->filter_popup;
-#line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
 #line 6630 "SearchFilter.c"
 		}
 	}
-#line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
 #line 6635 "SearchFilter.c"
 }
@@ -6637,11 +6637,11 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	SearchFilterToolbarSearchBox* _tmp0_ = NULL;
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1390 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_box;
-#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
 #line 6647 "SearchFilter.c"
 }
@@ -9484,59 +9484,59 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	guint _tmp17_ = 0U;
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar);
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->actions;
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp1_, NULL, FALSE);
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1158 "/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 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->actions;
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("flagged-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp3_, NULL, FALSE);
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1160 "/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 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("photos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp5_, NULL, FALSE);
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/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 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->actions;
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("videos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp7_, NULL, FALSE);
-#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/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 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->actions;
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("raw-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp9_, NULL, FALSE);
-#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/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 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->actions;
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp11_, NULL, FALSE);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/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 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->actions;
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp13_, NULL, FALSE);
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/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 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = self->priv->actions;
-#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp15_, NULL, FALSE);
-#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/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 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = self->priv->toolbar;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE);
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1168 "/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 607 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 3429c02..137318a 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -1052,7 +1052,6 @@ 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);
         
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 70feead..ea177d1 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.32.1, the Vala compiler
+/* SlideshowPage.c generated by valac 0.34.4, the Vala compiler
  * generated from SlideshowPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,6 +12,7 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
 #include <cairo.h>
@@ -314,7 +315,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -651,42 +653,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 655 "SlideshowPage.c"
+#line 657 "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 662 "SlideshowPage.c"
+#line 664 "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 669 "SlideshowPage.c"
+#line 671 "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 676 "SlideshowPage.c"
+#line 678 "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 683 "SlideshowPage.c"
+#line 685 "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 690 "SlideshowPage.c"
+#line 692 "SlideshowPage.c"
 }
 
 
@@ -925,14 +927,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 929 "SlideshowPage.c"
+#line 931 "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 936 "SlideshowPage.c"
+#line 938 "SlideshowPage.c"
 }
 
 
@@ -941,7 +943,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 945 "SlideshowPage.c"
+#line 947 "SlideshowPage.c"
 }
 
 
@@ -985,7 +987,7 @@ static void slideshow_page_real_switched_to (Page* base) {
 	pixbuf = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 989 "SlideshowPage.c"
+#line 991 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -1000,7 +1002,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 1004 "SlideshowPage.c"
+#line 1006 "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);
@@ -1014,7 +1016,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 1018 "SlideshowPage.c"
+#line 1020 "SlideshowPage.c"
 }
 
 
@@ -1031,7 +1033,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 1035 "SlideshowPage.c"
+#line 1037 "SlideshowPage.c"
 }
 
 
@@ -1054,14 +1056,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 1058 "SlideshowPage.c"
+#line 1060 "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 1065 "SlideshowPage.c"
+#line 1067 "SlideshowPage.c"
 			DataSource* forward = NULL;
 			DataSource* back = NULL;
 			ViewCollection* _tmp40_ = NULL;
@@ -1084,11 +1086,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 1088 "SlideshowPage.c"
+#line 1090 "SlideshowPage.c"
 			}
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp2_ = FALSE;
-#line 1092 "SlideshowPage.c"
+#line 1094 "SlideshowPage.c"
 			{
 				GdkPixbuf* _tmp3_ = NULL;
 				PixbufCache* _tmp4_ = NULL;
@@ -1105,8 +1107,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 1109 "SlideshowPage.c"
-					goto __catch458_g_error;
+#line 1111 "SlideshowPage.c"
+					goto __catch460_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1118,10 +1120,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 1122 "SlideshowPage.c"
+#line 1124 "SlideshowPage.c"
 			}
-			goto __finally458;
-			__catch458_g_error:
+			goto __finally460;
+			__catch460_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1172,7 +1174,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 1176 "SlideshowPage.c"
+#line 1178 "SlideshowPage.c"
 					ViewCollection* _tmp18_ = NULL;
 					DataView* _tmp19_ = NULL;
 					DataView* _tmp20_ = NULL;
@@ -1186,7 +1188,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 1190 "SlideshowPage.c"
+#line 1192 "SlideshowPage.c"
 				} else {
 					ViewCollection* _tmp21_ = NULL;
 					DataView* _tmp22_ = NULL;
@@ -1201,7 +1203,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 1205 "SlideshowPage.c"
+#line 1207 "SlideshowPage.c"
 				}
 #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp24_ = _g_object_ref0 (_tmp16_);
@@ -1223,7 +1225,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 1227 "SlideshowPage.c"
+#line 1229 "SlideshowPage.c"
 					Photo* _tmp31_ = NULL;
 					Photo* _tmp32_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1232,17 +1234,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 1236 "SlideshowPage.c"
+#line 1238 "SlideshowPage.c"
 				} else {
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = FALSE;
-#line 1240 "SlideshowPage.c"
+#line 1242 "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 1246 "SlideshowPage.c"
+#line 1248 "SlideshowPage.c"
 				} else {
 					Photo* _tmp33_ = NULL;
 					Photo* _tmp34_ = NULL;
@@ -1252,11 +1254,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 1256 "SlideshowPage.c"
+#line 1258 "SlideshowPage.c"
 				}
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp27_) {
-#line 1260 "SlideshowPage.c"
+#line 1262 "SlideshowPage.c"
 					const gchar* _tmp35_ = NULL;
 					GtkWindow* _tmp36_ = NULL;
 					GtkWindow* _tmp37_ = NULL;
@@ -1300,25 +1302,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 1304 "SlideshowPage.c"
+#line 1306 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next);
-#line 1308 "SlideshowPage.c"
+#line 1310 "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 1314 "SlideshowPage.c"
+#line 1316 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next_pixbuf);
-#line 1318 "SlideshowPage.c"
+#line 1320 "SlideshowPage.c"
 					}
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					return result;
-#line 1322 "SlideshowPage.c"
+#line 1324 "SlideshowPage.c"
 				}
 #line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp16_);
@@ -1328,9 +1330,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 1332 "SlideshowPage.c"
+#line 1334 "SlideshowPage.c"
 			}
-			__finally458:
+			__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"
@@ -1339,7 +1341,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 1343 "SlideshowPage.c"
+#line 1345 "SlideshowPage.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp40_ = self->priv->controller;
@@ -1405,46 +1407,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 1409 "SlideshowPage.c"
+#line 1411 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 1413 "SlideshowPage.c"
+#line 1415 "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 1419 "SlideshowPage.c"
+#line 1421 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 1423 "SlideshowPage.c"
+#line 1425 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return result;
-#line 1427 "SlideshowPage.c"
+#line 1429 "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 1434 "SlideshowPage.c"
+#line 1436 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next);
-#line 1438 "SlideshowPage.c"
+#line 1440 "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 1444 "SlideshowPage.c"
+#line 1446 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next_pixbuf);
-#line 1448 "SlideshowPage.c"
+#line 1450 "SlideshowPage.c"
 	}
 }
 
@@ -1459,7 +1461,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 1463 "SlideshowPage.c"
+#line 1465 "SlideshowPage.c"
 		GtkToolButton* _tmp1_ = NULL;
 		GtkToolButton* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -1481,7 +1483,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 1485 "SlideshowPage.c"
+#line 1487 "SlideshowPage.c"
 	} else {
 		GtkToolButton* _tmp6_ = NULL;
 		GtkToolButton* _tmp7_ = NULL;
@@ -1504,7 +1506,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 1508 "SlideshowPage.c"
+#line 1510 "SlideshowPage.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->playing;
@@ -1514,7 +1516,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 1518 "SlideshowPage.c"
+#line 1520 "SlideshowPage.c"
 }
 
 
@@ -1561,7 +1563,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 1565 "SlideshowPage.c"
+#line 1567 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1578,7 +1580,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 1582 "SlideshowPage.c"
+#line 1584 "SlideshowPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = prev_view;
@@ -1592,7 +1594,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 1596 "SlideshowPage.c"
+#line 1598 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1605,7 +1607,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 1609 "SlideshowPage.c"
+#line 1611 "SlideshowPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1636,7 +1638,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 1639 "SlideshowPage.c"
+#line 1641 "SlideshowPage.c"
 		}
 	}
 #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1651,7 +1653,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 1654 "SlideshowPage.c"
+#line 1656 "SlideshowPage.c"
 }
 
 
@@ -1703,7 +1705,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 1706 "SlideshowPage.c"
+#line 1708 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1720,7 +1722,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 1723 "SlideshowPage.c"
+#line 1725 "SlideshowPage.c"
 		}
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = next_view;
@@ -1734,7 +1736,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 1737 "SlideshowPage.c"
+#line 1739 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1747,7 +1749,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 1750 "SlideshowPage.c"
+#line 1752 "SlideshowPage.c"
 		}
 #line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1778,7 +1780,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 1780 "SlideshowPage.c"
+#line 1782 "SlideshowPage.c"
 		}
 	}
 #line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1799,7 +1801,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 1801 "SlideshowPage.c"
+#line 1803 "SlideshowPage.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = next_photo;
@@ -1813,7 +1815,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 1815 "SlideshowPage.c"
+#line 1817 "SlideshowPage.c"
 }
 
 
@@ -1855,7 +1857,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 1857 "SlideshowPage.c"
+#line 1859 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -1870,7 +1872,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 1872 "SlideshowPage.c"
+#line 1874 "SlideshowPage.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
@@ -1878,7 +1880,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 1880 "SlideshowPage.c"
+#line 1882 "SlideshowPage.c"
 }
 
 
@@ -1902,7 +1904,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1904 "SlideshowPage.c"
+#line 1906 "SlideshowPage.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->playing;
@@ -1912,7 +1914,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1914 "SlideshowPage.c"
+#line 1916 "SlideshowPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->timer;
@@ -1934,7 +1936,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1936 "SlideshowPage.c"
+#line 1938 "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));
@@ -1942,7 +1944,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	result = TRUE;
 #line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 1944 "SlideshowPage.c"
+#line 1946 "SlideshowPage.c"
 }
 
 
@@ -1957,7 +1959,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 1959 "SlideshowPage.c"
+#line 1961 "SlideshowPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1980,27 +1982,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 1982 "SlideshowPage.c"
+#line 1984 "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 1989 "SlideshowPage.c"
+#line 1991 "SlideshowPage.c"
 			}
 		}
 	} else {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1995 "SlideshowPage.c"
+#line 1997 "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 2002 "SlideshowPage.c"
+#line 2004 "SlideshowPage.c"
 			}
 		}
 	}
@@ -2012,11 +2014,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 2014 "SlideshowPage.c"
+#line 2016 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 2018 "SlideshowPage.c"
+#line 2020 "SlideshowPage.c"
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2025,17 +2027,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 2027 "SlideshowPage.c"
+#line 2029 "SlideshowPage.c"
 	} else {
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = TRUE;
-#line 2031 "SlideshowPage.c"
+#line 2033 "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 2037 "SlideshowPage.c"
+#line 2039 "SlideshowPage.c"
 }
 
 
@@ -2076,7 +2078,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 2078 "SlideshowPage.c"
+#line 2080 "SlideshowPage.c"
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		SlideshowPageSettingsDialog* _tmp7_ = NULL;
@@ -2148,7 +2150,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 2150 "SlideshowPage.c"
+#line 2152 "SlideshowPage.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = settings_dialog;
@@ -2164,7 +2166,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 2166 "SlideshowPage.c"
+#line 2168 "SlideshowPage.c"
 }
 
 
@@ -2209,7 +2211,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 2211 "SlideshowPage.c"
+#line 2213 "SlideshowPage.c"
 }
 
 
@@ -2249,7 +2251,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 2251 "SlideshowPage.c"
+#line 2253 "SlideshowPage.c"
 		gint random = 0;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
@@ -2281,7 +2283,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 2283 "SlideshowPage.c"
+#line 2285 "SlideshowPage.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = effect_id;
@@ -2291,7 +2293,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 2293 "SlideshowPage.c"
+#line 2295 "SlideshowPage.c"
 }
 
 
@@ -2364,14 +2366,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 2366 "SlideshowPage.c"
+#line 2368 "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 2373 "SlideshowPage.c"
+#line 2375 "SlideshowPage.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
@@ -2379,7 +2381,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 2381 "SlideshowPage.c"
+#line 2383 "SlideshowPage.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = title;
@@ -2447,7 +2449,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 2449 "SlideshowPage.c"
+#line 2451 "SlideshowPage.c"
 		Dimensions _tmp28_ = {0};
 		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
@@ -2459,7 +2461,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 2461 "SlideshowPage.c"
+#line 2463 "SlideshowPage.c"
 	}
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp31_ = x;
@@ -2471,7 +2473,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 2473 "SlideshowPage.c"
+#line 2475 "SlideshowPage.c"
 		Dimensions _tmp35_ = {0};
 		gint _tmp36_ = 0;
 		gint _tmp37_ = 0;
@@ -2483,7 +2485,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 2485 "SlideshowPage.c"
+#line 2487 "SlideshowPage.c"
 	}
 #line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp38_ = ctx;
@@ -2529,7 +2531,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 2531 "SlideshowPage.c"
+#line 2533 "SlideshowPage.c"
 }
 
 
@@ -2566,21 +2568,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 2568 "SlideshowPage.c"
+#line 2570 "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 2574 "SlideshowPage.c"
+#line 2576 "SlideshowPage.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 2578 "SlideshowPage.c"
+#line 2580 "SlideshowPage.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 2582 "SlideshowPage.c"
+#line 2584 "SlideshowPage.c"
 		cairo_t* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2589,7 +2591,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 2591 "SlideshowPage.c"
+#line 2593 "SlideshowPage.c"
 	}
 }
 
@@ -2599,14 +2601,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 2601 "SlideshowPage.c"
+#line 2603 "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 2608 "SlideshowPage.c"
+#line 2610 "SlideshowPage.c"
 }
 
 
@@ -2841,7 +2843,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 2843 "SlideshowPage.c"
+#line 2845 "SlideshowPage.c"
 	{
 		GeeIterator* _display_name_it = NULL;
 		TransitionEffectsManager* _tmp43_ = NULL;
@@ -2870,7 +2872,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 2872 "SlideshowPage.c"
+#line 2874 "SlideshowPage.c"
 			GeeIterator* _tmp49_ = NULL;
 			gboolean _tmp50_ = FALSE;
 			gchar* display_name = NULL;
@@ -2896,7 +2898,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			if (!_tmp50_) {
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2898 "SlideshowPage.c"
+#line 2900 "SlideshowPage.c"
 			}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp51_ = _display_name_it;
@@ -2914,7 +2916,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 				_g_free0 (display_name);
 #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 2916 "SlideshowPage.c"
+#line 2918 "SlideshowPage.c"
 			}
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp55_ = self->priv->transition_effect_selector;
@@ -2942,7 +2944,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 2944 "SlideshowPage.c"
+#line 2946 "SlideshowPage.c"
 				GtkComboBoxText* _tmp64_ = NULL;
 				gint _tmp65_ = 0;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2951,7 +2953,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 2953 "SlideshowPage.c"
+#line 2955 "SlideshowPage.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp66_ = i;
@@ -2959,11 +2961,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 2961 "SlideshowPage.c"
+#line 2963 "SlideshowPage.c"
 		}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_display_name_it);
-#line 2965 "SlideshowPage.c"
+#line 2967 "SlideshowPage.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp67_ = self->priv->transition_effect_selector;
@@ -3071,14 +3073,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 3073 "SlideshowPage.c"
+#line 3075 "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 3080 "SlideshowPage.c"
+#line 3082 "SlideshowPage.c"
 }
 
 
@@ -3103,17 +3105,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 3105 "SlideshowPage.c"
+#line 3107 "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 3111 "SlideshowPage.c"
+#line 3113 "SlideshowPage.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 3115 "SlideshowPage.c"
+#line 3117 "SlideshowPage.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	sensitive = _tmp2_;
@@ -3127,7 +3129,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 3129 "SlideshowPage.c"
+#line 3131 "SlideshowPage.c"
 }
 
 
@@ -3145,7 +3147,7 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
 	result = _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3147 "SlideshowPage.c"
+#line 3149 "SlideshowPage.c"
 }
 
 
@@ -3163,7 +3165,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 3165 "SlideshowPage.c"
+#line 3167 "SlideshowPage.c"
 }
 
 
@@ -3194,7 +3196,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 3196 "SlideshowPage.c"
+#line 3198 "SlideshowPage.c"
 		gchar* _tmp3_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
@@ -3204,7 +3206,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 3206 "SlideshowPage.c"
+#line 3208 "SlideshowPage.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
@@ -3224,17 +3226,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 3226 "SlideshowPage.c"
+#line 3228 "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 3232 "SlideshowPage.c"
+#line 3234 "SlideshowPage.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3236 "SlideshowPage.c"
+#line 3238 "SlideshowPage.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = g_strdup (_tmp9_);
@@ -3246,7 +3248,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 3248 "SlideshowPage.c"
+#line 3250 "SlideshowPage.c"
 }
 
 
@@ -3267,7 +3269,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 3269 "SlideshowPage.c"
+#line 3271 "SlideshowPage.c"
 }
 
 
@@ -3278,7 +3280,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 3280 "SlideshowPage.c"
+#line 3282 "SlideshowPage.c"
 }
 
 
@@ -3287,7 +3289,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 3289 "SlideshowPage.c"
+#line 3291 "SlideshowPage.c"
 }
 
 
@@ -3315,7 +3317,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 3317 "SlideshowPage.c"
+#line 3319 "SlideshowPage.c"
 }
 
 
@@ -3352,7 +3354,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 3354 "SlideshowPage.c"
+#line 3356 "SlideshowPage.c"
 }
 
 
@@ -3370,7 +3372,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 3372 "SlideshowPage.c"
+#line 3374 "SlideshowPage.c"
 }
 
 
@@ -3398,7 +3400,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 3400 "SlideshowPage.c"
+#line 3402 "SlideshowPage.c"
 }
 
 
diff --git a/src/SortedList.c b/src/SortedList.c
index 85f22a9..a858888 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -1,4 +1,4 @@
-/* SortedList.c generated by valac 0.32.1, the Vala compiler
+/* SortedList.c generated by valac 0.34.4, the Vala compiler
  * generated from SortedList.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -130,13 +130,13 @@ gint64 file_comparator (void* a, void* b) {
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = a;
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, G_TYPE_FILE, GFile));
+	_tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, g_file_get_type (), GFile));
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
 	path_a = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = b;
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, G_TYPE_FILE, GFile));
+	_tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, g_file_get_type (), GFile));
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	path_b = _tmp3_;
 #line 16 "/home/jens/Source/shotwell/src/SortedList.vala"
diff --git a/src/Tag.c b/src/Tag.c
index db41ec9..cb70820 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1,4 +1,4 @@
-/* Tag.c generated by valac 0.32.1, the Vala compiler
+/* Tag.c generated by valac 0.34.4, the Vala compiler
  * generated from Tag.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch467_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 __finally467;
-	__catch467_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"
 	}
-	__finally467:
+	__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 __catch468_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 __finally468;
-					__catch468_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"
 					}
-					__finally468:
+					__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 __catch469_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 __finally469;
-	__catch469_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"
 	}
-	__finally469:
+	__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"
@@ -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 __catch470_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 __finally470;
-	__catch470_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"
 	}
-	__finally470:
+	__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 __catch471_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 __finally471;
-	__catch471_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"
 	}
-	__finally471:
+	__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 __catch472_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 __finally472;
-	__catch472_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"
 	}
-	__finally472:
+	__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"
@@ -8022,35 +8022,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 8042 "Tag.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8050 "Tag.c"
 	} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8056 "Tag.c"
 	}
@@ -8064,37 +8064,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 8080 "Tag.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8088 "Tag.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 8100 "Tag.c"
 	}
@@ -8114,112 +8114,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 8124 "Tag.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 8130 "Tag.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 8134 "Tag.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 8138 "Tag.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 8150 "Tag.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 8160 "Tag.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 8166 "Tag.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 8180 "Tag.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 8190 "Tag.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 8196 "Tag.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 8205 "Tag.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 8225 "Tag.c"
 }
@@ -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 __catch473_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 __finally473;
-	__catch473_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"
 	}
-	__finally473:
+	__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 __catch474_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 __finally474;
-	__catch474_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"
 	}
-	__finally474:
+	__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/Thumbnail.c b/src/Thumbnail.c
index 062529f..c42e9ce 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.32.1, the Vala compiler
+/* Thumbnail.c generated by valac 0.34.4, the Vala compiler
  * generated from Thumbnail.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 9e928e3..4e8443f 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1,4 +1,4 @@
-/* ThumbnailCache.c generated by valac 0.32.1, the Vala compiler
+/* ThumbnailCache.c generated by valac 0.34.4, the Vala compiler
  * generated from ThumbnailCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -912,7 +912,7 @@ static void thumbnails_instance_init (Thumbnails * self) {
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv = THUMBNAILS_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -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 __catch233_g_error;
+			goto __catch235_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 __finally233;
-	__catch233_g_error:
+	goto __finally235;
+	__catch235_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 __finally233;
+			goto __finally235;
 		}
 #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"
 	}
-	__finally233:
+	__finally235:
 #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 __catch234_g_error;
+				goto __catch236_g_error;
 			}
 		}
-		goto __finally234;
-		__catch234_g_error:
+		goto __finally236;
+		__catch236_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"
 		}
-		__finally234:
+		__finally236:
 #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 __catch235_g_error;
+			goto __catch237_g_error;
 		}
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally237;
+	__catch237_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"
 	}
-	__finally235:
+	__finally237:
 #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 __catch236_g_error;
+			goto __catch238_g_error;
 		}
 	}
-	goto __finally236;
-	__catch236_g_error:
+	goto __finally238;
+	__catch238_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"
 	}
-	__finally236:
+	__finally238:
 #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 __catch237_g_error;
+				goto __catch239_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 __finally237;
-	__catch237_g_error:
+	goto __finally239;
+	__catch239_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 __catch238_g_error;
+					goto __catch240_g_error;
 				}
 			}
-			goto __finally238;
-			__catch238_g_error:
+			goto __finally240;
+			__catch240_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"
 			}
-			__finally238:
+			__finally240:
 #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"
 	}
-	__finally237:
+	__finally239:
 #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/TimedQueue.c b/src/TimedQueue.c
index 9d872a5..b2ba07c 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.32.1, the Vala compiler
+/* TimedQueue.c generated by valac 0.34.4, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Tombstone.c b/src/Tombstone.c
index cad1972..34517c5 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.32.1, the Vala compiler
+/* Tombstone.c generated by valac 0.34.4, the Vala compiler
  * generated from Tombstone.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch543_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 __finally543;
-	__catch543_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"
 	}
-	__finally543:
+	__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 __catch544_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 __finally544;
-				__catch544_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"
 				}
-				__finally544:
+				__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 __catch545_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 __finally545;
-		__catch545_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"
 		}
-		__finally545:
+		__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"
@@ -1904,7 +1904,7 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection
 #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv->file_map = _tmp0_;
 #line 1910 "Tombstone.c"
@@ -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 __catch546_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 __finally546;
-	__catch546_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"
 	}
-	__finally546:
+	__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 __catch547_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 __finally547;
-	__catch547_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"
 	}
-	__finally547:
+	__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 __catch548_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 __finally548;
-	__catch548_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"
 	}
-	__finally548:
+	__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/Tombstone.vala b/src/Tombstone.vala
index 33649d0..23cd984 100644
--- a/src/Tombstone.vala
+++ b/src/Tombstone.vala
@@ -121,7 +121,7 @@ public class TombstoneSourceCollection : DatabaseSourceCollection {
                 info = monitor.get_file_info(file);
             
             // Want to be conservative here; only resurrect a tombstone if file is actually detected
-            // as not present, and not some other problem (which may be intermittant)
+            // as not present, and not some other problem (which may be intermittent)
             if (info == null) {
                 try {
                     info = yield file.query_info_async(FileAttribute.STANDARD_NAME,
diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c
index c32a00a..2cbcab3 100644
--- a/src/UnityProgressBar.c
+++ b/src/UnityProgressBar.c
@@ -1,4 +1,4 @@
-/* UnityProgressBar.c generated by valac 0.32.1, the Vala compiler
+/* UnityProgressBar.c generated by valac 0.34.4, the Vala compiler
  * generated from UnityProgressBar.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Upgrades.c b/src/Upgrades.c
index 4be4e79..5a98673 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.32.1, the Vala compiler
+/* Upgrades.c generated by valac 0.34.4, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch589_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 __finally589;
-	__catch589_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"
 	}
-	__finally589:
+	__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 __catch590_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 __catch590_g_error;
+			goto __catch592_g_error;
 		}
 	}
-	goto __finally590;
-	__catch590_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"
 	}
-	__finally590:
+	__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/Upgrades.vala b/src/Upgrades.vala
index d60d195..85349ae 100644
--- a/src/Upgrades.vala
+++ b/src/Upgrades.vala
@@ -51,7 +51,7 @@ public class Upgrades {
 // When creating a new upgrade task, you MUST add it to the constructor
 // supplied in Upgrades (see above.)
 private interface UpgradeTask : Object{
-    // Returns the number of steps involved in the ugprade.
+    // Returns the number of steps involved in the upgrade.
     public abstract uint64 get_step_count();
     
     // Performs the upgrade.  Note that when using the progress
@@ -62,7 +62,7 @@ private interface UpgradeTask : Object{
 
 // Deletes the mimics folder, if it still exists.
 // Note: for the step count to be consistent, files cannot be written
-// to the mimcs folder for the durration of this task.
+// to the mimcs folder for the duration of this task.
 private class MimicsRemovalTask : Object, UpgradeTask {
     // Mimics folder (to be deleted, if present)
     private File mimic_dir = AppDirs.get_data_dir().get_child("mimics");
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index f1d6f07..7228849 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.32.1, the Vala compiler
+/* VideoMetadata.c generated by valac 0.34.4, the Vala compiler
  * generated from VideoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch571_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 __catch571_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 __catch571_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 __catch571_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 __finally571;
-	__catch571_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"
 	}
-	__finally571:
+	__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 __catch572_g_error;
+			goto __catch574_g_error;
 		}
 	}
-	goto __finally572;
-	__catch572_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"
 	}
-	__finally572:
+	__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 __catch573_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 __catch573_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 __catch573_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 __catch573_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 __catch573_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 __catch573_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 __catch573_g_error;
+				goto __catch575_g_error;
 			}
 		}
 	}
-	goto __finally573;
-	__catch573_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"
 	}
-	__finally573:
+	__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 __catch574_g_error;
+			goto __catch576_g_error;
 		}
 	}
-	goto __finally574;
-	__catch574_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"
 	}
-	__finally574:
+	__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"
@@ -1631,7 +1631,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 #line 1631 "VideoMetadata.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1670,7 +1670,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1836,15 +1836,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1849 "VideoMetadata.c"
 }
@@ -2142,7 +2142,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 268 "/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 __catch575_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 __catch575_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 __catch575_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 __finally575;
-	__catch575_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"
 	}
-	__finally575:
+	__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 __catch576_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_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"
 	}
-	__finally576:
+	__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"
@@ -2951,37 +2951,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2966 "VideoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 2974 "VideoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 2986 "VideoMetadata.c"
 	}
@@ -3001,112 +3001,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 3010 "VideoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 3016 "VideoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 3020 "VideoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 3024 "VideoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 3036 "VideoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 3046 "VideoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 3052 "VideoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 3066 "VideoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 3076 "VideoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 3082 "VideoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 3091 "VideoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3111 "VideoMetadata.c"
 }
@@ -4023,19 +4023,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 4040 "VideoMetadata.c"
 }
@@ -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 __catch577_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 __catch577_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 __catch577_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 __finally577;
-	__catch577_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"
 	}
-	__finally577:
+	__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 __catch578_g_error;
+			goto __catch580_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_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"
 	}
-	__finally578:
+	__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"
@@ -4575,7 +4575,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 #line 4575 "VideoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4614,7 +4614,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,7 +4643,7 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4671,7 +4671,7 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp2_ = skip_amount;
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), _tmp2_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), _tmp2_, &_inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index b3e9adb..638b755 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.32.1, the Vala compiler
+/* VideoMonitor.c generated by valac 0.34.4, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 23ea672..76d8864 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.32.1, the Vala compiler
+/* VideoSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from VideoSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1920,103 +1920,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1936 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1945 "VideoSupport.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1951 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1960 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1966 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1975 "VideoSupport.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1979 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1987 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1996 "VideoSupport.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 2000 "VideoSupport.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2022 "VideoSupport.c"
 }
@@ -2321,7 +2321,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2324 "VideoSupport.c"
-			goto __catch490_g_error;
+			goto __catch492_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2335,8 +2335,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (_tmp3_);
 #line 2337 "VideoSupport.c"
 	}
-	goto __finally490;
-	__catch490_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2355,7 +2355,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		return result;
 #line 2357 "VideoSupport.c"
 	}
-	__finally490:
+	__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"
@@ -2474,7 +2474,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 2477 "VideoSupport.c"
-				goto __catch491_video_error;
+				goto __catch493_video_error;
 			}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2500,8 +2500,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		clip_duration = _tmp26_;
 #line 2502 "VideoSupport.c"
 	}
-	goto __finally491;
-	__catch491_video_error:
+	goto __finally493;
+	__catch493_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
@@ -2554,7 +2554,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2555 "VideoSupport.c"
 	}
-	__finally491:
+	__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"
@@ -2603,7 +2603,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2605 "VideoSupport.c"
-			goto __catch492_g_error;
+			goto __catch494_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2699,8 +2699,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_media_metadata_unref0 (metadata);
 #line 2700 "VideoSupport.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
@@ -2719,7 +2719,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2720 "VideoSupport.c"
 	}
-	__finally492:
+	__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"
@@ -3092,7 +3092,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3094 "VideoSupport.c"
-			goto __catch493_g_error;
+			goto __catch495_g_error;
 		}
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3115,7 +3115,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
 #line 3117 "VideoSupport.c"
-			goto __catch493_g_error;
+			goto __catch495_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3208,8 +3208,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (d);
 #line 3209 "VideoSupport.c"
 	}
-	goto __finally493;
-	__catch493_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3249,9 +3249,9 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
 #line 3251 "VideoSupport.c"
-		goto __finally493;
+		goto __finally495;
 	}
-	__finally493:
+	__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"
@@ -3408,7 +3408,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3410 "VideoSupport.c"
-			goto __catch494_g_error;
+			goto __catch496_g_error;
 		}
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
@@ -3416,8 +3416,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
 #line 3417 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally496;
+	__catch496_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -3455,7 +3455,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		return result;
 #line 3456 "VideoSupport.c"
 	}
-	__finally494:
+	__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"
@@ -3490,7 +3490,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3498,7 +3498,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
 #line 3500 "VideoSupport.c"
-			goto __catch495_g_error;
+			goto __catch497_g_error;
 		}
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3514,8 +3514,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (unix_input);
 #line 3515 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
@@ -3538,7 +3538,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_error_free0 (e);
 #line 3539 "VideoSupport.c"
 	}
-	__finally495:
+	__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"
@@ -4947,7 +4947,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 #line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4946 "VideoSupport.c"
-				goto __catch496_g_error;
+				goto __catch498_g_error;
 			}
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
@@ -4959,8 +4959,8 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_object_unref0 (_tmp35_);
 #line 4957 "VideoSupport.c"
 		}
-		goto __finally496;
-		__catch496_g_error:
+		goto __finally498;
+		__catch498_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
@@ -4986,7 +4986,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_error_free0 (err);
 #line 4984 "VideoSupport.c"
 		}
-		__finally496:
+		__finally498:
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5097,7 +5097,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5096 "VideoSupport.c"
-				goto __catch497_database_error;
+				goto __catch499_database_error;
 			}
 #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);
@@ -5130,7 +5130,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp5_->backlinks = _tmp7_;
 #line 5128 "VideoSupport.c"
 			}
-			__finally498:
+			__finally500:
 			{
 				VideoRow* _tmp8_ = NULL;
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5144,7 +5144,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5143 "VideoSupport.c"
-					goto __catch497_database_error;
+					goto __catch499_database_error;
 				}
 #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);
@@ -5156,8 +5156,8 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			}
 		}
 	}
-	goto __finally497;
-	__catch497_database_error:
+	goto __finally499;
+	__catch499_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5184,7 +5184,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_error_free0 (err);
 #line 5182 "VideoSupport.c"
 	}
-	__finally497:
+	__finally499:
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5272,7 +5272,7 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			return result;
 #line 5270 "VideoSupport.c"
 		}
-		__finally499:
+		__finally501:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5387,7 +5387,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5386 "VideoSupport.c"
-				goto __catch500_database_error;
+				goto __catch502_database_error;
 			}
 #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);
@@ -5418,8 +5418,8 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 5415 "VideoSupport.c"
 		}
 	}
-	goto __finally500;
-	__catch500_database_error:
+	goto __finally502;
+	__catch502_database_error:
 	{
 		GError* err = NULL;
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5444,7 +5444,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		return result;
 #line 5442 "VideoSupport.c"
 	}
-	__finally500:
+	__finally502:
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5510,7 +5510,7 @@ void video_import_failed (Video* video) {
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5509 "VideoSupport.c"
-				goto __catch501_database_error;
+				goto __catch503_database_error;
 			}
 #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);
@@ -5521,8 +5521,8 @@ void video_import_failed (Video* video) {
 #line 5518 "VideoSupport.c"
 		}
 	}
-	goto __finally501;
-	__catch501_database_error:
+	goto __finally503;
+	__catch503_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -5538,7 +5538,7 @@ void video_import_failed (Video* video) {
 		_g_error_free0 (err);
 #line 5536 "VideoSupport.c"
 	}
-	__finally501:
+	__finally503:
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5617,7 +5617,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			_tmp11_ = backing[0];
 #line 5615 "VideoSupport.c"
 		}
-		__finally502:
+		__finally504:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5734,7 +5734,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			return result;
 #line 5732 "VideoSupport.c"
 		}
-		__finally503:
+		__finally505:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5938,7 +5938,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			return;
 #line 5936 "VideoSupport.c"
 		}
-		__finally504:
+		__finally506:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6013,7 +6013,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 			return result;
 #line 6011 "VideoSupport.c"
 		}
-		__finally505:
+		__finally507:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6112,7 +6112,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6111 "VideoSupport.c"
-						goto __catch507_database_error;
+						goto __catch509_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6133,8 +6133,8 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 6130 "VideoSupport.c"
 				}
 			}
-			goto __finally507;
-			__catch507_database_error:
+			goto __finally509;
+			__catch509_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6163,7 +6163,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				return;
 #line 6161 "VideoSupport.c"
 			}
-			__finally507:
+			__finally509:
 #line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6166 "VideoSupport.c"
@@ -6197,7 +6197,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp16_->title = _tmp18_;
 #line 6195 "VideoSupport.c"
 		}
-		__finally506:
+		__finally508:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6272,7 +6272,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			return result;
 #line 6270 "VideoSupport.c"
 		}
-		__finally508:
+		__finally510:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6374,7 +6374,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6373 "VideoSupport.c"
-						goto __catch510_database_error;
+						goto __catch512_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6395,8 +6395,8 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 6392 "VideoSupport.c"
 				}
 			}
-			goto __finally510;
-			__catch510_database_error:
+			goto __finally512;
+			__catch512_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6427,7 +6427,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				return result;
 #line 6425 "VideoSupport.c"
 			}
-			__finally510:
+			__finally512:
 #line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6430 "VideoSupport.c"
@@ -6461,7 +6461,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp16_->comment = _tmp18_;
 #line 6459 "VideoSupport.c"
 		}
-		__finally509:
+		__finally511:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6537,7 +6537,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 			return result;
 #line 6535 "VideoSupport.c"
 		}
-		__finally511:
+		__finally513:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6638,7 +6638,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6637 "VideoSupport.c"
-						goto __catch513_database_error;
+						goto __catch515_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6657,8 +6657,8 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 6654 "VideoSupport.c"
 				}
 			}
-			goto __finally513;
-			__catch513_database_error:
+			goto __finally515;
+			__catch515_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6685,7 +6685,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				return;
 #line 6683 "VideoSupport.c"
 			}
-			__finally513:
+			__finally515:
 #line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6688 "VideoSupport.c"
@@ -6713,7 +6713,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp16_->rating = _tmp17_;
 #line 6711 "VideoSupport.c"
 		}
-		__finally512:
+		__finally514:
 		{
 			VideoRow* _tmp18_ = NULL;
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6772,7 +6772,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6770 "VideoSupport.c"
 		}
-		__finally514:
+		__finally516:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6822,7 +6822,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6820 "VideoSupport.c"
 		}
-		__finally515:
+		__finally517:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7036,7 +7036,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			return;
 #line 7034 "VideoSupport.c"
 		}
-		__finally516:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7115,7 +7115,7 @@ static gchar* video_real_to_string (DataObject* base) {
 			return result;
 #line 7113 "VideoSupport.c"
 		}
-		__finally517:
+		__finally519:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7169,7 +7169,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 			return;
 #line 7167 "VideoSupport.c"
 		}
-		__finally518:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7225,7 +7225,7 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			return result;
 #line 7223 "VideoSupport.c"
 		}
-		__finally519:
+		__finally521:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7286,11 +7286,11 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7285 "VideoSupport.c"
-					goto __catch521_g_error;
+					goto __catch523_g_error;
 				}
 			}
-			goto __finally521;
-			__catch521_g_error:
+			goto __finally523;
+			__catch523_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
@@ -7309,7 +7309,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				_g_error_free0 (e);
 #line 7307 "VideoSupport.c"
 			}
-			__finally521:
+			__finally523:
 #line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7312 "VideoSupport.c"
@@ -7337,7 +7337,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp9_->exposure_time = _tmp10_;
 #line 7335 "VideoSupport.c"
 		}
-		__finally520:
+		__finally522:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7412,7 +7412,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			return;
 #line 7410 "VideoSupport.c"
 		}
-		__finally522:
+		__finally524:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7499,7 +7499,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			return result;
 #line 7497 "VideoSupport.c"
 		}
-		__finally523:
+		__finally525:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7555,7 +7555,7 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			return result;
 #line 7553 "VideoSupport.c"
 		}
-		__finally524:
+		__finally526:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7658,7 +7658,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7657 "VideoSupport.c"
-					goto __finally526;
+					goto __finally528;
 				}
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
@@ -7670,7 +7670,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp14_->timestamp = (time_t) _tmp16_;
 #line 7668 "VideoSupport.c"
 			}
-			__finally526:
+			__finally528:
 			{
 				VideoRow* _tmp17_ = NULL;
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7684,7 +7684,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7683 "VideoSupport.c"
-					goto __catch525_database_error;
+					goto __catch527_database_error;
 				}
 #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);
@@ -7696,8 +7696,8 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 			}
 		}
 	}
-	goto __finally525;
-	__catch525_database_error:
+	goto __finally527;
+	__catch527_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -7715,7 +7715,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		return;
 #line 7713 "VideoSupport.c"
 	}
-	__finally525:
+	__finally527:
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7776,7 +7776,7 @@ gchar* video_get_filename (Video* self) {
 			return result;
 #line 7774 "VideoSupport.c"
 		}
-		__finally527:
+		__finally529:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7918,7 +7918,7 @@ gdouble video_get_clip_duration (Video* self) {
 			return result;
 #line 7916 "VideoSupport.c"
 		}
-		__finally528:
+		__finally530:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7973,7 +7973,7 @@ gboolean video_get_is_interpretable (Video* self) {
 			return result;
 #line 7971 "VideoSupport.c"
 		}
-		__finally529:
+		__finally531:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8040,7 +8040,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp5_->is_interpretable = _tmp6_;
 #line 8038 "VideoSupport.c"
 		}
-		__finally530:
+		__finally532:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8082,7 +8082,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8081 "VideoSupport.c"
-				goto __catch531_database_error;
+				goto __catch533_database_error;
 			}
 #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);
@@ -8093,8 +8093,8 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 8090 "VideoSupport.c"
 		}
 	}
-	goto __finally531;
-	__catch531_database_error:
+	goto __finally533;
+	__catch533_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
@@ -8110,7 +8110,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		_g_error_free0 (e);
 #line 8108 "VideoSupport.c"
 	}
-	__finally531:
+	__finally533:
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8186,7 +8186,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 8185 "VideoSupport.c"
-				goto __catch532_video_error;
+				goto __catch534_video_error;
 			}
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
@@ -8214,8 +8214,8 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		preview_frame = _tmp9_;
 #line 8212 "VideoSupport.c"
 	}
-	goto __finally532;
-	__catch532_video_error:
+	goto __finally534;
+	__catch534_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
@@ -8247,7 +8247,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		return result;
 #line 8245 "VideoSupport.c"
 	}
-	__finally532:
+	__finally534:
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8322,7 +8322,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			_tmp21_->clip_duration = _tmp22_;
 #line 8320 "VideoSupport.c"
 		}
-		__finally533:
+		__finally535:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8411,7 +8411,7 @@ static void video_real_destroy (DataSource* base) {
 #line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8410 "VideoSupport.c"
-				goto __catch534_database_error;
+				goto __catch536_database_error;
 			}
 #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);
@@ -8422,8 +8422,8 @@ static void video_real_destroy (DataSource* base) {
 #line 8419 "VideoSupport.c"
 		}
 	}
-	goto __finally534;
-	__catch534_database_error:
+	goto __finally536;
+	__catch536_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
@@ -8444,7 +8444,7 @@ static void video_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 8442 "VideoSupport.c"
 	}
-	__finally534:
+	__finally536:
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8638,7 +8638,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8637 "VideoSupport.c"
-						goto __catch536_database_error;
+						goto __catch538_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8657,8 +8657,8 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 8654 "VideoSupport.c"
 				}
 			}
-			goto __finally536;
-			__catch536_database_error:
+			goto __finally538;
+			__catch538_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8693,7 +8693,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 				return result;
 #line 8691 "VideoSupport.c"
 			}
-			__finally536:
+			__finally538:
 #line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8696 "VideoSupport.c"
@@ -8721,7 +8721,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			_tmp21_->flags = _tmp22_;
 #line 8719 "VideoSupport.c"
 		}
-		__finally535:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8842,7 +8842,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8841 "VideoSupport.c"
-						goto __catch538_database_error;
+						goto __catch540_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8861,8 +8861,8 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 8858 "VideoSupport.c"
 				}
 			}
-			goto __finally538;
-			__catch538_database_error:
+			goto __finally540;
+			__catch540_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8897,7 +8897,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 				return result;
 #line 8895 "VideoSupport.c"
 			}
-			__finally538:
+			__finally540:
 #line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8900 "VideoSupport.c"
@@ -8925,7 +8925,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			_tmp21_->flags = _tmp22_;
 #line 8923 "VideoSupport.c"
 		}
-		__finally537:
+		__finally539:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8998,7 +8998,7 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 			return result;
 #line 8996 "VideoSupport.c"
 		}
-		__finally539:
+		__finally541:
 		{
 			VideoRow* _tmp6_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9120,7 +9120,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9119 "VideoSupport.c"
-					goto __finally541;
+					goto __finally543;
 				}
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
@@ -9134,7 +9134,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_tmp15_->filepath = _tmp17_;
 #line 9132 "VideoSupport.c"
 			}
-			__finally541:
+			__finally543:
 			{
 				VideoRow* _tmp18_ = NULL;
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9148,7 +9148,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9147 "VideoSupport.c"
-					goto __catch540_database_error;
+					goto __catch542_database_error;
 				}
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
@@ -9164,8 +9164,8 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 			}
 		}
 	}
-	goto __finally540;
-	__catch540_database_error:
+	goto __finally542;
+	__catch542_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9187,7 +9187,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		return;
 #line 9185 "VideoSupport.c"
 	}
-	__finally540:
+	__finally542:
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9357,7 +9357,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9356 "VideoSupport.c"
-				goto __catch542_g_error;
+				goto __catch544_g_error;
 			}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
@@ -9368,7 +9368,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9367 "VideoSupport.c"
-				goto __catch542_g_error;
+				goto __catch544_g_error;
 			}
 #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
@@ -9376,8 +9376,8 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 9374 "VideoSupport.c"
 		}
-		goto __finally542;
-		__catch542_g_error:
+		goto __finally544;
+		__catch544_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9407,7 +9407,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_error_free0 (err);
 #line 9405 "VideoSupport.c"
 		}
-		__finally542:
+		__finally544:
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index 7f2836e..74b5c60 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index 71768fa..f39dba0 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.32.1, the Vala compiler
+/* Camera.c generated by valac 0.34.4, the Vala compiler
  * generated from Camera.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 6a49bcf..926608c 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.32.1, the Vala compiler
+/* CameraTable.c generated by valac 0.34.4, the Vala compiler
  * generated from CameraTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch54_gphoto_error;
+				goto __catch56_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 __finally54;
-	__catch54_gphoto_error:
+	goto __finally56;
+	__catch56_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"
 	}
-	__finally54:
+	__finally56:
 #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 __catch55_gphoto_error;
+				goto __catch57_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 __finally55;
-	__catch55_gphoto_error:
+	goto __finally57;
+	__catch57_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"
 	}
-	__finally55:
+	__finally57:
 #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"
@@ -1545,37 +1545,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1559 "CameraTable.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1567 "CameraTable.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1579 "CameraTable.c"
 	}
@@ -1595,112 +1595,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1603 "CameraTable.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1609 "CameraTable.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1613 "CameraTable.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1617 "CameraTable.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1629 "CameraTable.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1639 "CameraTable.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1645 "CameraTable.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1659 "CameraTable.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1669 "CameraTable.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1675 "CameraTable.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1684 "CameraTable.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1704 "CameraTable.c"
 }
@@ -1709,11 +1709,11 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1717 "CameraTable.c"
 	{
@@ -1728,98 +1728,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1748 "CameraTable.c"
-				goto __catch56_g_regex_error;
+				goto __catch58_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1757 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1773 "CameraTable.c"
-				goto __catch56_g_regex_error;
+				goto __catch58_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1784 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1798 "CameraTable.c"
 	}
-	goto __finally56;
-	__catch56_g_regex_error:
+	goto __finally58;
+	__catch58_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
-	__finally56:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally58:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1823 "CameraTable.c"
 	}
@@ -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 __catch57_gphoto_error;
+				goto __catch59_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 __finally57;
-	__catch57_gphoto_error:
+	goto __finally59;
+	__catch59_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"
 	}
-	__finally57:
+	__finally59:
 #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 a703945..b21ac78 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.32.1, the Vala compiler
+/* GPhoto.c generated by valac 0.34.4, the Vala compiler
  * generated from GPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1032,103 +1032,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1048 "GPhoto.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1057 "GPhoto.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1063 "GPhoto.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1072 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1078 "GPhoto.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1087 "GPhoto.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1091 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1099 "GPhoto.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1108 "GPhoto.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1112 "GPhoto.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1134 "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 __catch58_g_error;
+			goto __catch60_g_error;
 		}
 	}
-	goto __finally58;
-	__catch58_g_error:
+	goto __finally60;
+	__catch60_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"
 	}
-	__finally58:
+	__finally60:
 #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 __catch59_g_error;
+			goto __catch61_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 __finally59;
-	__catch59_g_error:
+	goto __finally61;
+	__catch61_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 __finally59;
+			goto __finally61;
 		}
 #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"
 	}
-	__finally59:
+	__finally61:
 #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"
@@ -1769,7 +1769,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp46_ = mins;
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp45_ = _tmp47_;
 #line 187 "/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 __catch60_g_error;
+			goto __catch62_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 __finally60;
-	__catch60_g_error:
+	goto __finally62;
+	__catch62_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"
 	}
-	__finally60:
+	__finally62:
 #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"
@@ -2472,7 +2472,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, G_TYPE_INPUT_STREAM, GInputStream);
+		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2577,7 +2577,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, G_TYPE_INPUT_STREAM, GInputStream);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index b16e32b..3616cb2 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -115,7 +115,7 @@ namespace GPhoto {
         return true;
     }
 
-    // Libgphoto will in some instances refuse to get metadata from a camera, but the camera is accessable as a
+    // Libgphoto will in some instances refuse to get metadata from a camera, but the camera is accessible as a
     // filesystem.  In these cases shotwell can access the file directly. See:
     // http://redmine.yorba.org/issues/2959
     public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) {
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 928a456..5e7cfb2 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.32.1, the Vala compiler
+/* ImportPage.c generated by valac 0.34.4, the Vala compiler
  * generated from ImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -349,6 +349,46 @@ typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass;
 typedef struct _LibraryPhotoSourceCollection LibraryPhotoSourceCollection;
 typedef struct _LibraryPhotoSourceCollectionClass LibraryPhotoSourceCollectionClass;
 
+#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))
+#define IS_MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE))
+#define IS_MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE))
+#define MEDIA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE, MediaSourceClass))
+
+typedef struct _MediaSource MediaSource;
+typedef struct _MediaSourceClass MediaSourceClass;
+
+#define TYPE_PHOTO_SOURCE (photo_source_get_type ())
+#define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource))
+#define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass))
+#define IS_PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_SOURCE))
+#define IS_PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_SOURCE))
+#define PHOTO_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_SOURCE, PhotoSourceClass))
+
+typedef struct _PhotoSource PhotoSource;
+typedef struct _PhotoSourceClass PhotoSourceClass;
+
+#define TYPE_PHOTO (photo_get_type ())
+#define PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO, Photo))
+#define PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO, PhotoClass))
+#define IS_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO))
+#define IS_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO))
+#define PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO, PhotoClass))
+
+typedef struct _Photo Photo;
+typedef struct _PhotoClass PhotoClass;
+
+#define TYPE_LIBRARY_PHOTO (library_photo_get_type ())
+#define LIBRARY_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_PHOTO, LibraryPhoto))
+#define LIBRARY_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_PHOTO, LibraryPhotoClass))
+#define IS_LIBRARY_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LIBRARY_PHOTO))
+#define IS_LIBRARY_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LIBRARY_PHOTO))
+#define LIBRARY_PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LIBRARY_PHOTO, LibraryPhotoClass))
+
+typedef struct _LibraryPhoto LibraryPhoto;
+typedef struct _LibraryPhotoClass LibraryPhotoClass;
+
 #define TYPE_VIDEO_SOURCE_COLLECTION (video_source_collection_get_type ())
 #define VIDEO_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection))
 #define VIDEO_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollectionClass))
@@ -609,6 +649,7 @@ typedef struct _BatchImportJobClass BatchImportJobClass;
 
 typedef struct _ImportPageCameraImportJob ImportPageCameraImportJob;
 typedef struct _ImportPageCameraImportJobClass ImportPageCameraImportJobClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_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))
@@ -619,17 +660,6 @@ 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))
-#define MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE, MediaSourceClass))
-#define IS_MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE))
-#define IS_MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE))
-#define MEDIA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE, MediaSourceClass))
-
-typedef struct _MediaSource MediaSource;
-typedef struct _MediaSourceClass MediaSourceClass;
 #define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL)))
 
 #define TYPE_SORTED_LIST (sorted_list_get_type ())
@@ -740,26 +770,6 @@ typedef struct _BackingPhotoRowPrivate BackingPhotoRowPrivate;
 
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
 typedef struct _BackingPhotoID BackingPhotoID;
-
-#define TYPE_PHOTO_SOURCE (photo_source_get_type ())
-#define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource))
-#define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass))
-#define IS_PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_SOURCE))
-#define IS_PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_SOURCE))
-#define PHOTO_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_SOURCE, PhotoSourceClass))
-
-typedef struct _PhotoSource PhotoSource;
-typedef struct _PhotoSourceClass PhotoSourceClass;
-
-#define TYPE_PHOTO (photo_get_type ())
-#define PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO, Photo))
-#define PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO, PhotoClass))
-#define IS_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO))
-#define IS_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO))
-#define PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO, PhotoClass))
-
-typedef struct _Photo Photo;
-typedef struct _PhotoClass PhotoClass;
 typedef struct _ViewFilterPrivate ViewFilterPrivate;
 typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate;
 typedef struct _ImportPageImportPageSearchViewFilterPrivate ImportPageImportPageSearchViewFilterPrivate;
@@ -1172,7 +1182,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -1705,8 +1716,14 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
-gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize);
 void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result);
+gboolean photo_id_is_valid (PhotoID *self);
+GType media_source_get_type (void) G_GNUC_CONST;
+GType photo_source_get_type (void) G_GNUC_CONST;
+GType photo_get_type (void) G_GNUC_CONST;
+GType library_photo_get_type (void) G_GNUC_CONST;
+LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id);
+time_t media_source_get_exposure_time (MediaSource* self);
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize);
 GType video_id_get_type (void) G_GNUC_CONST;
@@ -1858,8 +1875,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);
-#define RESOURCES_IMPORT "shotwell-import"
-#define RESOURCES_IMPORT_ALL "shotwell-import-all"
 static void import_page_update_toolbar_state (ImportPage* self);
 static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base);
 static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base);
@@ -1877,13 +1892,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 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);
+static void import_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
 GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self);
 static GVariant* _variant_new15 (gboolean value);
+static void import_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 Camera* import_page_get_camera (ImportPage* self);
 gchar* import_page_get_uri (ImportPage* self);
 gboolean import_page_is_busy (ImportPage* self);
@@ -1905,6 +1920,8 @@ static void import_page_real_ready (Page* base);
 static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked);
 static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 #define RESOURCES_APP_TITLE "Shotwell"
 void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message);
 gboolean import_page_unmount_camera (ImportPage* self, GMount* mount);
@@ -1915,7 +1932,6 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou
 static void import_page_clear_all_import_sources (ImportPage* self);
 Marker* data_collection_start_marking (DataCollection* self);
 void marker_mark_all (Marker* self);
-GType media_source_get_type (void) G_GNUC_CONST;
 gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
 static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target);
 static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list);
@@ -2050,8 +2066,6 @@ GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
 void backing_photo_id_free (BackingPhotoID* self);
 static gboolean import_page_camera_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
-GType photo_source_get_type (void) G_GNUC_CONST;
-GType photo_get_type (void) G_GNUC_CONST;
 void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
 void photo_set_raw_developer (Photo* self, RawDeveloper d);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
@@ -2090,14 +2104,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 2093 "ImportPage.c"
+#line 2107 "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 2100 "ImportPage.c"
+#line 2114 "ImportPage.c"
 }
 
 
@@ -2115,7 +2129,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 2118 "ImportPage.c"
+#line 2132 "ImportPage.c"
 }
 
 
@@ -2124,7 +2138,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 2127 "ImportPage.c"
+#line 2141 "ImportPage.c"
 }
 
 
@@ -2147,7 +2161,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 2150 "ImportPage.c"
+#line 2164 "ImportPage.c"
 }
 
 
@@ -2230,14 +2244,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 2233 "ImportPage.c"
+#line 2247 "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 2240 "ImportPage.c"
+#line 2254 "ImportPage.c"
 }
 
 
@@ -2256,7 +2270,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 2259 "ImportPage.c"
+#line 2273 "ImportPage.c"
 }
 
 
@@ -2274,7 +2288,7 @@ gchar* import_source_get_camera_name (ImportSource* self) {
 	result = _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2277 "ImportPage.c"
+#line 2291 "ImportPage.c"
 }
 
 
@@ -2292,7 +2306,7 @@ Camera* import_source_get_camera (ImportSource* self) {
 	result = _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2295 "ImportPage.c"
+#line 2309 "ImportPage.c"
 }
 
 
@@ -2307,7 +2321,7 @@ gint import_source_get_fsid (ImportSource* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2310 "ImportPage.c"
+#line 2324 "ImportPage.c"
 }
 
 
@@ -2325,7 +2339,7 @@ gchar* import_source_get_folder (ImportSource* self) {
 	result = _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2328 "ImportPage.c"
+#line 2342 "ImportPage.c"
 }
 
 
@@ -2343,7 +2357,7 @@ gchar* import_source_get_filename (ImportSource* self) {
 	result = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2346 "ImportPage.c"
+#line 2360 "ImportPage.c"
 }
 
 
@@ -2358,7 +2372,7 @@ gulong import_source_get_filesize (ImportSource* self) {
 	result = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2361 "ImportPage.c"
+#line 2375 "ImportPage.c"
 }
 
 
@@ -2373,7 +2387,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 2376 "ImportPage.c"
+#line 2390 "ImportPage.c"
 }
 
 
@@ -2389,7 +2403,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 2392 "ImportPage.c"
+#line 2406 "ImportPage.c"
 }
 
 
@@ -2398,7 +2412,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 2401 "ImportPage.c"
+#line 2415 "ImportPage.c"
 }
 
 
@@ -2411,7 +2425,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 2414 "ImportPage.c"
+#line 2428 "ImportPage.c"
 }
 
 
@@ -2420,7 +2434,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 2423 "ImportPage.c"
+#line 2437 "ImportPage.c"
 }
 
 
@@ -2465,7 +2479,7 @@ gchar* import_source_get_fulldir (ImportSource* self) {
 	result = _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2468 "ImportPage.c"
+#line 2482 "ImportPage.c"
 }
 
 
@@ -2508,7 +2522,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 2511 "ImportPage.c"
+#line 2525 "ImportPage.c"
 }
 
 
@@ -2524,7 +2538,7 @@ static gchar* gp_result_to_full_string (int self) {
 	result = _tmp1_;
 #line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	return result;
-#line 2527 "ImportPage.c"
+#line 2541 "ImportPage.c"
 }
 
 
@@ -2572,7 +2586,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 2575 "ImportPage.c"
+#line 2589 "ImportPage.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -2600,7 +2614,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 2603 "ImportPage.c"
+#line 2617 "ImportPage.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp8_;
@@ -2608,7 +2622,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 2611 "ImportPage.c"
+#line 2625 "ImportPage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = import_source_get_camera (self);
@@ -2638,7 +2652,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 2641 "ImportPage.c"
+#line 2655 "ImportPage.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
@@ -2663,7 +2677,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 2666 "ImportPage.c"
+#line 2680 "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_);
@@ -2677,21 +2691,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 2680 "ImportPage.c"
+#line 2694 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp27_) {
-#line 2684 "ImportPage.c"
+#line 2698 "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 2690 "ImportPage.c"
+#line 2704 "ImportPage.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = FALSE;
-#line 2694 "ImportPage.c"
+#line 2708 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp26_;
@@ -2699,7 +2713,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 2702 "ImportPage.c"
+#line 2716 "ImportPage.c"
 }
 
 
@@ -2715,7 +2729,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 2718 "ImportPage.c"
+#line 2732 "ImportPage.c"
 }
 
 
@@ -2734,7 +2748,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 2737 "ImportPage.c"
+#line 2751 "ImportPage.c"
 }
 
 
@@ -2743,7 +2757,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 2746 "ImportPage.c"
+#line 2760 "ImportPage.c"
 }
 
 
@@ -2754,7 +2768,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 2757 "ImportPage.c"
+#line 2771 "ImportPage.c"
 }
 
 
@@ -2776,7 +2790,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 2779 "ImportPage.c"
+#line 2793 "ImportPage.c"
 }
 
 
@@ -2829,14 +2843,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 2832 "ImportPage.c"
+#line 2846 "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 2839 "ImportPage.c"
+#line 2853 "ImportPage.c"
 }
 
 
@@ -2862,7 +2876,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 2865 "ImportPage.c"
+#line 2879 "ImportPage.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp0_;
@@ -2874,7 +2888,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 2877 "ImportPage.c"
+#line 2891 "ImportPage.c"
 }
 
 
@@ -2902,13 +2916,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 2905 "ImportPage.c"
+#line 2919 "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 2911 "ImportPage.c"
+#line 2925 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -2927,7 +2941,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 2930 "ImportPage.c"
+#line 2944 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2936,13 +2950,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 2939 "ImportPage.c"
+#line 2953 "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 2945 "ImportPage.c"
+#line 2959 "ImportPage.c"
 }
 
 
@@ -2958,7 +2972,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 2961 "ImportPage.c"
+#line 2975 "ImportPage.c"
 }
 
 
@@ -2974,7 +2988,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 2977 "ImportPage.c"
+#line 2991 "ImportPage.c"
 }
 
 
@@ -2990,7 +3004,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 2993 "ImportPage.c"
+#line 3007 "ImportPage.c"
 }
 
 
@@ -3006,7 +3020,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 3009 "ImportPage.c"
+#line 3023 "ImportPage.c"
 }
 
 
@@ -3021,7 +3035,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 3024 "ImportPage.c"
+#line 3038 "ImportPage.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3032,7 +3046,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 3035 "ImportPage.c"
+#line 3049 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp4_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3041,13 +3055,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 3044 "ImportPage.c"
+#line 3058 "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 3050 "ImportPage.c"
+#line 3064 "ImportPage.c"
 }
 
 
@@ -3066,7 +3080,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 3069 "ImportPage.c"
+#line 3083 "ImportPage.c"
 }
 
 
@@ -3126,14 +3140,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 3129 "ImportPage.c"
+#line 3143 "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 3136 "ImportPage.c"
+#line 3150 "ImportPage.c"
 }
 
 
@@ -3157,7 +3171,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 3160 "ImportPage.c"
+#line 3174 "ImportPage.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3168,7 +3182,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 3171 "ImportPage.c"
+#line 3185 "ImportPage.c"
 	} else {
 		gchar* _tmp6_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3177,7 +3191,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 3180 "ImportPage.c"
+#line 3194 "ImportPage.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
@@ -3185,7 +3199,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 3188 "ImportPage.c"
+#line 3202 "ImportPage.c"
 }
 
 
@@ -3201,7 +3215,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 3204 "ImportPage.c"
+#line 3218 "ImportPage.c"
 }
 
 
@@ -3217,7 +3231,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 3220 "ImportPage.c"
+#line 3234 "ImportPage.c"
 }
 
 
@@ -3235,26 +3249,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 3238 "ImportPage.c"
+#line 3252 "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 3244 "ImportPage.c"
+#line 3258 "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 3251 "ImportPage.c"
+#line 3265 "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 3257 "ImportPage.c"
+#line 3271 "ImportPage.c"
 }
 
 
@@ -3282,13 +3296,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 3285 "ImportPage.c"
+#line 3299 "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 3291 "ImportPage.c"
+#line 3305 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3307,7 +3321,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 3310 "ImportPage.c"
+#line 3324 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3316,20 +3330,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 3319 "ImportPage.c"
+#line 3333 "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 3325 "ImportPage.c"
+#line 3339 "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 3332 "ImportPage.c"
+#line 3346 "ImportPage.c"
 }
 
 
@@ -3375,7 +3389,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 3378 "ImportPage.c"
+#line 3392 "ImportPage.c"
 }
 
 
@@ -3394,7 +3408,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 3397 "ImportPage.c"
+#line 3411 "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));
@@ -3402,7 +3416,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 3405 "ImportPage.c"
+#line 3419 "ImportPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->metadata;
@@ -3414,7 +3428,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 3417 "ImportPage.c"
+#line 3431 "ImportPage.c"
 		MetadataDateTime* _tmp6_ = NULL;
 		time_t _tmp7_ = 0;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3423,14 +3437,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 3426 "ImportPage.c"
+#line 3440 "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 3433 "ImportPage.c"
+#line 3447 "ImportPage.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp4_;
@@ -3438,7 +3452,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 3441 "ImportPage.c"
+#line 3455 "ImportPage.c"
 }
 
 
@@ -3452,7 +3466,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 3455 "ImportPage.c"
+#line 3469 "ImportPage.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3463,19 +3477,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 3466 "ImportPage.c"
+#line 3480 "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 3472 "ImportPage.c"
+#line 3486 "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 3478 "ImportPage.c"
+#line 3492 "ImportPage.c"
 }
 
 
@@ -3490,7 +3504,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 3493 "ImportPage.c"
+#line 3507 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		PhotoMetadata* _tmp2_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3501,7 +3515,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 		result = _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3504 "ImportPage.c"
+#line 3518 "ImportPage.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->metadata;
@@ -3511,7 +3525,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	result = _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3514 "ImportPage.c"
+#line 3528 "ImportPage.c"
 }
 
 
@@ -3528,7 +3542,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 3531 "ImportPage.c"
+#line 3545 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3539,7 +3553,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 3542 "ImportPage.c"
+#line 3556 "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));
@@ -3551,7 +3565,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 3554 "ImportPage.c"
+#line 3568 "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));
@@ -3559,13 +3573,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 3562 "ImportPage.c"
+#line 3576 "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 3568 "ImportPage.c"
+#line 3582 "ImportPage.c"
 }
 
 
@@ -3593,13 +3607,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 3596 "ImportPage.c"
+#line 3610 "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 3602 "ImportPage.c"
+#line 3616 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3618,7 +3632,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 3621 "ImportPage.c"
+#line 3635 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3627,13 +3641,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 3630 "ImportPage.c"
+#line 3644 "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 3636 "ImportPage.c"
+#line 3650 "ImportPage.c"
 }
 
 
@@ -3648,7 +3662,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 3651 "ImportPage.c"
+#line 3665 "ImportPage.c"
 }
 
 
@@ -3666,7 +3680,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 3669 "ImportPage.c"
+#line 3683 "ImportPage.c"
 }
 
 
@@ -3685,7 +3699,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 3688 "ImportPage.c"
+#line 3702 "ImportPage.c"
 }
 
 
@@ -3703,7 +3717,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
 	result = _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3706 "ImportPage.c"
+#line 3720 "ImportPage.c"
 }
 
 
@@ -3726,13 +3740,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 3729 "ImportPage.c"
+#line 3743 "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 3735 "ImportPage.c"
+#line 3749 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
 		PhotoImportSource* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -3749,19 +3763,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 3752 "ImportPage.c"
+#line 3766 "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 3758 "ImportPage.c"
+#line 3772 "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 3764 "ImportPage.c"
+#line 3778 "ImportPage.c"
 }
 
 
@@ -3790,7 +3804,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 3793 "ImportPage.c"
+#line 3807 "ImportPage.c"
 }
 
 
@@ -3805,7 +3819,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 3808 "ImportPage.c"
+#line 3822 "ImportPage.c"
 }
 
 
@@ -3823,7 +3837,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 3826 "ImportPage.c"
+#line 3840 "ImportPage.c"
 }
 
 
@@ -3883,11 +3897,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 3886 "ImportPage.c"
+#line 3900 "ImportPage.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	pixbuf = NULL;
-#line 3890 "ImportPage.c"
+#line 3904 "ImportPage.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -3901,8 +3915,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 3904 "ImportPage.c"
-			goto __catch61_g_error;
+#line 3918 "ImportPage.c"
+			goto __catch63_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3914,10 +3928,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 3917 "ImportPage.c"
+#line 3931 "ImportPage.c"
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -3942,9 +3956,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 3945 "ImportPage.c"
+#line 3959 "ImportPage.c"
 	}
-	__finally61:
+	__finally63:
 #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"
@@ -3955,7 +3969,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 3958 "ImportPage.c"
+#line 3972 "ImportPage.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = pixbuf;
@@ -3965,7 +3979,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 3968 "ImportPage.c"
+#line 3982 "ImportPage.c"
 		GdkPixbuf* _tmp16_ = NULL;
 		GdkPixbuf* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
@@ -3973,7 +3987,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 3976 "ImportPage.c"
+#line 3990 "ImportPage.c"
 			GdkPixbuf* _tmp17_ = NULL;
 			GdkPixbuf* _tmp18_ = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -3991,7 +4005,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 3994 "ImportPage.c"
+#line 4008 "ImportPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = import_preview_placeholder_preview;
@@ -4001,7 +4015,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 4004 "ImportPage.c"
+#line 4018 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = pixbuf;
@@ -4011,7 +4025,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 4014 "ImportPage.c"
+#line 4028 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
@@ -4021,11 +4035,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 4024 "ImportPage.c"
+#line 4038 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp22_) {
-#line 4028 "ImportPage.c"
+#line 4042 "ImportPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
 		GdkPixbuf* _tmp28_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4036,13 +4050,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 4039 "ImportPage.c"
+#line 4053 "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 4045 "ImportPage.c"
+#line 4059 "ImportPage.c"
 		PhotoImportSource* photo_import_source = NULL;
 		ImportSource* _tmp30_ = NULL;
 		PhotoImportSource* _tmp31_ = NULL;
@@ -4062,7 +4076,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 4065 "ImportPage.c"
+#line 4079 "ImportPage.c"
 			PhotoImportSource* _tmp34_ = NULL;
 			PhotoMetadata* _tmp35_ = NULL;
 			PhotoMetadata* _tmp36_ = NULL;
@@ -4076,15 +4090,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 4079 "ImportPage.c"
+#line 4093 "ImportPage.c"
 		} else {
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = FALSE;
-#line 4083 "ImportPage.c"
+#line 4097 "ImportPage.c"
 		}
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp32_) {
-#line 4087 "ImportPage.c"
+#line 4101 "ImportPage.c"
 			PhotoImportSource* _tmp37_ = NULL;
 			PhotoMetadata* _tmp38_ = NULL;
 			PhotoMetadata* _tmp39_ = NULL;
@@ -4109,7 +4123,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 4112 "ImportPage.c"
+#line 4126 "ImportPage.c"
 		}
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = photo_import_source;
@@ -4123,7 +4137,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 4126 "ImportPage.c"
+#line 4140 "ImportPage.c"
 			const gchar* _tmp47_ = NULL;
 			gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -4137,11 +4151,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 4140 "ImportPage.c"
+#line 4154 "ImportPage.c"
 		}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 4144 "ImportPage.c"
+#line 4158 "ImportPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp50_ = pixbuf;
@@ -4151,14 +4165,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 4154 "ImportPage.c"
+#line 4168 "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 4161 "ImportPage.c"
+#line 4175 "ImportPage.c"
 }
 
 
@@ -4169,9 +4183,9 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	PhotoImportSource* _tmp1_ = NULL;
 	PhotoImportSource* _tmp2_ = NULL;
 	VideoImportSource* video_import_source = NULL;
-	ImportSource* _tmp39_ = NULL;
-	VideoImportSource* _tmp40_ = NULL;
-	VideoImportSource* _tmp41_ = NULL;
+	ImportSource* _tmp49_ = NULL;
+	VideoImportSource* _tmp50_ = NULL;
+	VideoImportSource* _tmp51_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), FALSE);
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4182,7 +4196,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 4185 "ImportPage.c"
+#line 4199 "ImportPage.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo_import_source = _tmp1_;
@@ -4190,7 +4204,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 4193 "ImportPage.c"
+#line 4207 "ImportPage.c"
 		gchar* preview_md5 = NULL;
 		PhotoImportSource* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -4219,7 +4233,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 4222 "ImportPage.c"
+#line 4236 "ImportPage.c"
 			const gchar* _tmp10_ = NULL;
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -4231,15 +4245,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 4234 "ImportPage.c"
+#line 4248 "ImportPage.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = FALSE;
-#line 4238 "ImportPage.c"
+#line 4252 "ImportPage.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_) {
-#line 4242 "ImportPage.c"
+#line 4256 "ImportPage.c"
 			const gchar* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
 			PhotoID _tmp15_ = {0};
@@ -4264,13 +4278,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 4267 "ImportPage.c"
+#line 4281 "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 4273 "ImportPage.c"
+#line 4287 "ImportPage.c"
 			guint64 filesize = 0ULL;
 			ImportSource* _tmp18_ = NULL;
 			ImportSource* _tmp19_ = NULL;
@@ -4293,15 +4307,17 @@ 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 4296 "ImportPage.c"
+#line 4310 "ImportPage.c"
+				PhotoID duplicated_photo_id = {0};
 				LibraryPhotoSourceCollection* _tmp23_ = NULL;
 				ImportSource* _tmp24_ = NULL;
 				ImportSource* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
 				gchar* _tmp27_ = NULL;
 				guint64 _tmp28_ = 0ULL;
-				gboolean _tmp29_ = FALSE;
-				gboolean _tmp30_ = FALSE;
+				PhotoID _tmp29_ = {0};
+				PhotoID _tmp30_ = {0};
+				gboolean _tmp31_ = FALSE;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = library_photo_global;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4315,7 +4331,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = filesize;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp29_ = library_photo_source_collection_has_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_);
+				library_photo_source_collection_get_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_, &_tmp29_);
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = _tmp29_;
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4323,167 +4339,216 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp25_);
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp30_) {
-#line 4327 "ImportPage.c"
-					LibraryPhotoSourceCollection* _tmp31_ = NULL;
-					ImportSource* _tmp32_ = NULL;
-					ImportSource* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					gchar* _tmp35_ = NULL;
-					guint64 _tmp36_ = 0ULL;
-					PhotoID _tmp37_ = {0};
-					DuplicatedFile* _tmp38_ = NULL;
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp31_ = library_photo_global;
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp32_ = import_preview_get_import_source (self);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp33_ = _tmp32_;
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp34_ = import_source_get_filename (_tmp33_);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp35_ = _tmp34_;
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp36_ = filesize;
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					library_photo_source_collection_get_basename_filesize_duplicate (_tmp31_, _tmp35_, (gint64) _tmp36_, &_tmp37_);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp38_ = duplicated_file_create_from_photo_id (&_tmp37_);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_object_unref0 (self->priv->duplicated_file);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					self->priv->duplicated_file = _tmp38_;
+				duplicated_photo_id = _tmp30_;
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp35_);
+				_tmp31_ = photo_id_is_valid (&duplicated_photo_id);
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_object_unref0 (_tmp33_);
+				if (_tmp31_) {
+#line 4347 "ImportPage.c"
+					LibraryPhoto* duplicated_photo = NULL;
+					LibraryPhotoSourceCollection* _tmp32_ = NULL;
+					PhotoID _tmp33_ = {0};
+					LibraryPhoto* _tmp34_ = NULL;
+					time_t photo_exposure_time = 0;
+					PhotoImportSource* _tmp35_ = NULL;
+					time_t _tmp36_ = 0;
+					time_t duplicated_photo_exposure_time = 0;
+					LibraryPhoto* _tmp37_ = NULL;
+					time_t _tmp38_ = 0;
+					time_t _tmp39_ = 0;
+					time_t _tmp40_ = 0;
+#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp32_ = library_photo_global;
+#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp33_ = duplicated_photo_id;
+#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp34_ = library_photo_source_collection_fetch (_tmp32_, &_tmp33_);
+#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					duplicated_photo = _tmp34_;
+#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp35_ = photo_import_source;
+#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp36_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					photo_exposure_time = _tmp36_;
 #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					result = TRUE;
-#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (preview_md5);
+					_tmp37_ = duplicated_photo;
 #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_object_unref0 (photo_import_source);
+					_tmp38_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					return result;
-#line 4368 "ImportPage.c"
+					duplicated_photo_exposure_time = _tmp38_;
+#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp39_ = photo_exposure_time;
+#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp40_ = duplicated_photo_exposure_time;
+#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (_tmp39_ == _tmp40_) {
+#line 4386 "ImportPage.c"
+						LibraryPhotoSourceCollection* _tmp41_ = NULL;
+						ImportSource* _tmp42_ = NULL;
+						ImportSource* _tmp43_ = NULL;
+						gchar* _tmp44_ = NULL;
+						gchar* _tmp45_ = NULL;
+						guint64 _tmp46_ = 0ULL;
+						PhotoID _tmp47_ = {0};
+						DuplicatedFile* _tmp48_ = NULL;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp41_ = library_photo_global;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp42_ = import_preview_get_import_source (self);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp43_ = _tmp42_;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp44_ = import_source_get_filename (_tmp43_);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp45_ = _tmp44_;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp46_ = filesize;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						library_photo_source_collection_get_basename_filesize_duplicate (_tmp41_, _tmp45_, (gint64) _tmp46_, &_tmp47_);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp48_ = duplicated_file_create_from_photo_id (&_tmp47_);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_object_unref0 (self->priv->duplicated_file);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						self->priv->duplicated_file = _tmp48_;
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_free0 (_tmp45_);
+#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_object_unref0 (_tmp43_);
+#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						result = TRUE;
+#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_object_unref0 (duplicated_photo);
+#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_free0 (preview_md5);
+#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_object_unref0 (photo_import_source);
+#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						return result;
+#line 4429 "ImportPage.c"
+					}
+#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_object_unref0 (duplicated_photo);
+#line 4433 "ImportPage.c"
 				}
 			}
 		}
-#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (preview_md5);
-#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4380 "ImportPage.c"
-	}
-#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp39_ = import_preview_get_import_source (self);
-#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp40_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp39_) : NULL;
-#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp40_ == NULL) {
-#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp39_);
-#line 4390 "ImportPage.c"
-	}
-#line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	video_import_source = _tmp40_;
-#line 357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp41_ = video_import_source;
-#line 357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp41_ != NULL) {
-#line 4398 "ImportPage.c"
-		VideoSourceCollection* _tmp42_ = NULL;
-		VideoImportSource* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		VideoImportSource* _tmp46_ = NULL;
-		gulong _tmp47_ = 0UL;
-		gboolean _tmp48_ = FALSE;
-		gboolean _tmp49_ = FALSE;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp42_ = video_global;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = video_import_source;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = _tmp44_;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp46_ = video_import_source;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp47_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp48_ = video_source_collection_has_basename_filesize_duplicate (_tmp42_, _tmp45_, (guint64) _tmp47_);
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp49_ = _tmp48_;
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp45_);
-#line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp49_) {
-#line 4427 "ImportPage.c"
-			VideoSourceCollection* _tmp50_ = NULL;
-			VideoImportSource* _tmp51_ = NULL;
-			gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-			VideoImportSource* _tmp54_ = NULL;
-			gulong _tmp55_ = 0UL;
-			VideoID _tmp56_ = {0};
-			DuplicatedFile* _tmp57_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp50_ = video_global;
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp51_ = video_import_source;
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp52_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp53_ = _tmp52_;
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp54_ = video_import_source;
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp55_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			video_source_collection_get_basename_filesize_duplicate (_tmp50_, _tmp53_, (guint64) _tmp55_, &_tmp56_);
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp57_ = duplicated_file_create_from_video_id (&_tmp56_);
-#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (self->priv->duplicated_file);
+#line 4445 "ImportPage.c"
+	}
+#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp49_ = import_preview_get_import_source (self);
+#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp49_) : NULL;
+#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp50_ == NULL) {
+#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_object_unref0 (_tmp49_);
+#line 4455 "ImportPage.c"
+	}
+#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	video_import_source = _tmp50_;
 #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			self->priv->duplicated_file = _tmp57_;
+	_tmp51_ = video_import_source;
 #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp53_);
+	if (_tmp51_ != NULL) {
+#line 4463 "ImportPage.c"
+		VideoSourceCollection* _tmp52_ = NULL;
+		VideoImportSource* _tmp53_ = NULL;
+		gchar* _tmp54_ = NULL;
+		gchar* _tmp55_ = NULL;
+		VideoImportSource* _tmp56_ = NULL;
+		gulong _tmp57_ = 0UL;
+		gboolean _tmp58_ = FALSE;
+		gboolean _tmp59_ = FALSE;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			result = TRUE;
+		_tmp52_ = video_global;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (video_import_source);
+		_tmp53_ = video_import_source;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (photo_import_source);
+		_tmp54_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp55_ = _tmp54_;
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp56_ = video_import_source;
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp57_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp58_ = video_source_collection_has_basename_filesize_duplicate (_tmp52_, _tmp55_, (guint64) _tmp57_);
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp59_ = _tmp58_;
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_free0 (_tmp55_);
+#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		if (_tmp59_) {
+#line 4492 "ImportPage.c"
+			VideoSourceCollection* _tmp60_ = NULL;
+			VideoImportSource* _tmp61_ = NULL;
+			gchar* _tmp62_ = NULL;
+			gchar* _tmp63_ = NULL;
+			VideoImportSource* _tmp64_ = NULL;
+			gulong _tmp65_ = 0UL;
+			VideoID _tmp66_ = {0};
+			DuplicatedFile* _tmp67_ = NULL;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp60_ = video_global;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp61_ = video_import_source;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp63_ = _tmp62_;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp64_ = video_import_source;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp65_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			video_source_collection_get_basename_filesize_duplicate (_tmp60_, _tmp63_, (guint64) _tmp65_, &_tmp66_);
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp67_ = duplicated_file_create_from_video_id (&_tmp66_);
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_object_unref0 (self->priv->duplicated_file);
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			self->priv->duplicated_file = _tmp67_;
+#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_free0 (_tmp63_);
+#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			result = TRUE;
+#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_object_unref0 (video_import_source);
+#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_object_unref0 (photo_import_source);
+#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4466 "ImportPage.c"
+#line 4531 "ImportPage.c"
 		}
-#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (video_import_source);
-#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4476 "ImportPage.c"
+#line 4541 "ImportPage.c"
 	}
-#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (video_import_source);
-#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (photo_import_source);
-#line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4486 "ImportPage.c"
+#line 4551 "ImportPage.c"
 }
 
 
@@ -4492,42 +4557,42 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	gboolean _tmp0_ = FALSE;
 	DuplicatedFile* _tmp1_ = NULL;
 	DuplicatedFile* _tmp2_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
-#line 380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = import_preview_is_already_imported (self);
-#line 380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp0_) {
-#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4505 "ImportPage.c"
+#line 4570 "ImportPage.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->duplicated_file;
-#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp2_;
-#line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4515 "ImportPage.c"
+#line 4580 "ImportPage.c"
 }
 
 
 ImportSource* import_preview_get_import_source (ImportPreview* self) {
 	ImportSource* result = NULL;
 	DataSource* _tmp0_ = NULL;
-#line 386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
-#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4530 "ImportPage.c"
+#line 4595 "ImportPage.c"
 }
 
 
@@ -4538,14 +4603,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 4541 "ImportPage.c"
+#line 4606 "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 4548 "ImportPage.c"
+#line 4613 "ImportPage.c"
 }
 
 
@@ -4557,7 +4622,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 4560 "ImportPage.c"
+#line 4625 "ImportPage.c"
 }
 
 
@@ -4579,39 +4644,39 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect
 	CameraAccumulator* _tmp1_ = NULL;
 	CameraAccumulator* _tmp2_ = NULL;
 	CameraAccumulator* _tmp3_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
-#line 397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = collection;
-#line 397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (CameraViewTracker*) core_view_tracker_construct (object_type, _tmp0_);
-#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->all;
-#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->visible;
-#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->selected;
-#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	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"
+#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4598 "ImportPage.c"
+#line 4663 "ImportPage.c"
 }
 
 
 CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
-#line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection);
-#line 4605 "ImportPage.c"
+#line 4670 "ImportPage.c"
 }
 
 
 static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
-#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_view_tracker_parent_class = g_type_class_peek_parent (klass);
-#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize;
-#line 4614 "ImportPage.c"
+#line 4679 "ImportPage.c"
 }
 
 
@@ -4619,35 +4684,35 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) {
 	CameraAccumulator* _tmp0_ = NULL;
 	CameraAccumulator* _tmp1_ = NULL;
 	CameraAccumulator* _tmp2_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera_accumulator_new ();
-#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->all = _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = camera_accumulator_new ();
-#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->visible = _tmp1_;
-#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = camera_accumulator_new ();
-#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->selected = _tmp2_;
-#line 4634 "ImportPage.c"
+#line 4699 "ImportPage.c"
 }
 
 
 static void camera_view_tracker_finalize (CoreTracker* obj) {
 	CameraViewTracker * self;
-#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker);
-#line 392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->all);
-#line 393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->visible);
-#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->selected);
-#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj);
-#line 4650 "ImportPage.c"
+#line 4715 "ImportPage.c"
 }
 
 
@@ -4675,110 +4740,110 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	PhotoImportSource* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	PhotoImportSource* _tmp6_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = object;
-#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->_total;
-#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_accumulator_set_total (self, _tmp2_ + 1);
-#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = source;
-#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL);
-#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo = _tmp4_;
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = photo;
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4702 "ImportPage.c"
+#line 4767 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = photo;
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4711 "ImportPage.c"
+#line 4776 "ImportPage.c"
 	} else {
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4715 "ImportPage.c"
+#line 4780 "ImportPage.c"
 	}
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4719 "ImportPage.c"
+#line 4784 "ImportPage.c"
 		gint _tmp9_ = 0;
-#line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
-#line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4725 "ImportPage.c"
+#line 4790 "ImportPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		PhotoImportSource* _tmp11_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = photo;
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_ != NULL) {
-#line 4733 "ImportPage.c"
+#line 4798 "ImportPage.c"
 			PhotoImportSource* _tmp12_ = NULL;
 			PhotoFileFormat _tmp13_ = 0;
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp12_ = photo;
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = photo_import_source_get_file_format (_tmp12_);
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4742 "ImportPage.c"
+#line 4807 "ImportPage.c"
 		} else {
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = FALSE;
-#line 4746 "ImportPage.c"
+#line 4811 "ImportPage.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp10_) {
-#line 4750 "ImportPage.c"
+#line 4815 "ImportPage.c"
 			gint _tmp14_ = 0;
-#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = self->priv->_raw;
-#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4756 "ImportPage.c"
+#line 4821 "ImportPage.c"
 		} else {
 			ImportSource* _tmp15_ = NULL;
-#line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = source;
-#line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4763 "ImportPage.c"
+#line 4828 "ImportPage.c"
 				gint _tmp16_ = 0;
-#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = self->priv->_videos;
-#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4769 "ImportPage.c"
+#line 4834 "ImportPage.c"
 			}
 		}
 	}
-#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (photo);
-#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (source);
-#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4781 "ImportPage.c"
+#line 4846 "ImportPage.c"
 }
 
 
@@ -4794,142 +4859,142 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	PhotoImportSource* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	PhotoImportSource* _tmp6_ = NULL;
-#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = object;
-#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->_total;
-#line 429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_accumulator_set_total (self, _tmp2_ + 1);
-#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = source;
-#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL);
-#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo = _tmp4_;
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = photo;
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4821 "ImportPage.c"
+#line 4886 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = photo;
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4830 "ImportPage.c"
+#line 4895 "ImportPage.c"
 	} else {
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4834 "ImportPage.c"
+#line 4899 "ImportPage.c"
 	}
-#line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4838 "ImportPage.c"
+#line 4903 "ImportPage.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
-#line 433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_vala_assert (_tmp9_ > 0, "photos > 0");
-#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->_photos;
-#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4849 "ImportPage.c"
+#line 4914 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		PhotoImportSource* _tmp12_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = photo;
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ != NULL) {
-#line 4857 "ImportPage.c"
+#line 4922 "ImportPage.c"
 			PhotoImportSource* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = photo;
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = photo_import_source_get_file_format (_tmp13_);
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4866 "ImportPage.c"
+#line 4931 "ImportPage.c"
 		} else {
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 4870 "ImportPage.c"
+#line 4935 "ImportPage.c"
 		}
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 4874 "ImportPage.c"
+#line 4939 "ImportPage.c"
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
-#line 436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = self->priv->_raw;
-#line 436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_vala_assert (_tmp15_ > 0, "raw > 0");
-#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = self->priv->_raw;
-#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4885 "ImportPage.c"
+#line 4950 "ImportPage.c"
 		} else {
 			ImportSource* _tmp17_ = NULL;
-#line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = source;
-#line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4892 "ImportPage.c"
+#line 4957 "ImportPage.c"
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
-#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = self->priv->_videos;
-#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_vala_assert (_tmp18_ > 0, "videos > 0");
-#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = self->priv->_videos;
-#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4903 "ImportPage.c"
+#line 4968 "ImportPage.c"
 			}
 		}
 	}
-#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (photo);
-#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (source);
-#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4915 "ImportPage.c"
+#line 4980 "ImportPage.c"
 }
 
 
 static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) {
 	CameraAccumulator * self;
 	gboolean result = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4932 "ImportPage.c"
+#line 4997 "ImportPage.c"
 }
 
 
@@ -4940,217 +5005,217 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), NULL);
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->_total;
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->_photos;
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->_videos;
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->_raw;
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = g_strdup_printf ("%d total/%d photos/%d videos/%d raw", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp4_;
-#line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4959 "ImportPage.c"
+#line 5024 "ImportPage.c"
 }
 
 
 CameraAccumulator* camera_accumulator_construct (GType object_type) {
 	CameraAccumulator * self = NULL;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (CameraAccumulator*) g_object_new (object_type, NULL);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4969 "ImportPage.c"
+#line 5034 "ImportPage.c"
 }
 
 
 CameraAccumulator* camera_accumulator_new (void) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 4976 "ImportPage.c"
+#line 5041 "ImportPage.c"
 }
 
 
 gint camera_accumulator_get_total (CameraAccumulator* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->_total;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4991 "ImportPage.c"
+#line 5056 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
 	gint _tmp0_ = 0;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_total = _tmp0_;
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "total");
-#line 5005 "ImportPage.c"
+#line 5070 "ImportPage.c"
 }
 
 
 gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->_photos;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5020 "ImportPage.c"
+#line 5085 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) {
 	gint _tmp0_ = 0;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_photos = _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "photos");
-#line 5034 "ImportPage.c"
+#line 5099 "ImportPage.c"
 }
 
 
 gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->_videos;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5049 "ImportPage.c"
+#line 5114 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) {
 	gint _tmp0_ = 0;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_videos = _tmp0_;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "videos");
-#line 5063 "ImportPage.c"
+#line 5128 "ImportPage.c"
 }
 
 
 gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->_raw;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5078 "ImportPage.c"
+#line 5143 "ImportPage.c"
 }
 
 
 static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
 	gint _tmp0_ = 0;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_raw = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "raw");
-#line 5092 "ImportPage.c"
+#line 5157 "ImportPage.c"
 }
 
 
 static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_accumulator_parent_class = g_type_class_peek_parent (klass);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (CameraAccumulatorPrivate));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_camera_accumulator_get_property;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_camera_accumulator_set_property;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_accumulator_finalize;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL, g_param_spec_int ("total", "total", "total", 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"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS, g_param_spec_int ("photos", "photos", "photos", 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"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	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"
+#line 411 "/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 5115 "ImportPage.c"
+#line 5180 "ImportPage.c"
 }
 
 
 static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	camera_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_include;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_uninclude;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5128 "ImportPage.c"
+#line 5193 "ImportPage.c"
 }
 
 
 static void camera_accumulator_instance_init (CameraAccumulator * self) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = CAMERA_ACCUMULATOR_GET_PRIVATE (self);
-#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_total = 0;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_photos = 0;
-#line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_videos = 0;
-#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_raw = 0;
-#line 5143 "ImportPage.c"
+#line 5208 "ImportPage.c"
 }
 
 
 static void camera_accumulator_finalize (GObject* obj) {
 	CameraAccumulator * self;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj);
-#line 5153 "ImportPage.c"
+#line 5218 "ImportPage.c"
 }
 
 
@@ -5171,39 +5236,39 @@ GType camera_accumulator_get_type (void) {
 static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	CameraAccumulator * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (property_id) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_TOTAL:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_total (self));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_PHOTOS:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_photos (self));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_VIDEOS:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_videos (self));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_RAW:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_value_set_int (value, camera_accumulator_get_raw (self));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5200 "ImportPage.c"
+#line 5265 "ImportPage.c"
 		default:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/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"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5206 "ImportPage.c"
+#line 5271 "ImportPage.c"
 	}
 }
 
@@ -5211,47 +5276,47 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
 static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	CameraAccumulator * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (property_id) {
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_TOTAL:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_total (self, g_value_get_int (value));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_PHOTOS:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, g_value_get_int (value));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_VIDEOS:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_videos (self, g_value_get_int (value));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case CAMERA_ACCUMULATOR_RAW:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_raw (self, g_value_get_int (value));
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5240 "ImportPage.c"
+#line 5305 "ImportPage.c"
 		default:
-#line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 411 "/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"
+#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5246 "ImportPage.c"
+#line 5311 "ImportPage.c"
 	}
 }
 
 
 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"
+#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_media_added_removed ((ImportPage*) self);
-#line 5254 "ImportPage.c"
+#line 5319 "ImportPage.c"
 }
 
 
@@ -5268,69 +5333,69 @@ 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"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_selected ((ImportPage*) self);
-#line 5273 "ImportPage.c"
+#line 5338 "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"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_all ((ImportPage*) self);
-#line 5280 "ImportPage.c"
+#line 5345 "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"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 5287 "ImportPage.c"
+#line 5352 "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"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5294 "ImportPage.c"
+#line 5359 "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"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5303 "ImportPage.c"
+#line 5368 "ImportPage.c"
 }
 
 
 static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = import_page_preview_comparator_predicate (object, alteration);
-#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5312 "ImportPage.c"
+#line 5377 "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"
+#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5319 "ImportPage.c"
+#line 5384 "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"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5326 "ImportPage.c"
+#line 5391 "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"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5333 "ImportPage.c"
+#line 5398 "ImportPage.c"
 }
 
 
@@ -5377,80 +5442,80 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	GValue _tmp51_ = {0};
 	LibraryPhotoSourceCollection* _tmp52_ = NULL;
 	VideoSourceCollection* _tmp53_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = _ ("Camera");
-#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPage*) checkerboard_page_construct (object_type, _tmp0_);
-#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = camera;
-#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _GPHOTO_REF_CAMERA0 (_tmp1_);
-#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->camera = _tmp2_;
-#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = uri;
-#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->uri);
-#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->uri = _tmp4_;
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = uri;
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = g_strdup_printf ("ImportSources for %s", _tmp5_);
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _tmp6_;
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = import_source_collection_new (_tmp7_);
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (self->priv->import_sources);
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection);
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (_tmp7_);
-#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = icon;
-#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = g_strdup (_tmp9_);
-#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->icon);
-#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->icon = _tmp10_;
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = _tmp11_;
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = camera_view_tracker_new (_tmp12_);
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->tracker = _tmp13_;
-#line 716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp12_);
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = display_name;
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (NULL != _tmp14_) {
-#line 5442 "ImportPage.c"
+#line 5507 "ImportPage.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = display_name;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (self->priv->camera_name);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->camera_name = _tmp16_;
-#line 5453 "ImportPage.c"
+#line 5518 "ImportPage.c"
 	} else {
 		CameraAbilities abilities = {0};
 		int res = 0;
@@ -5458,189 +5523,189 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		CameraAbilities _tmp18_ = {0};
 		int _tmp19_ = 0;
 		int _tmp20_ = 0;
-#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = camera;
-#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = gp_camera_get_abilities (_tmp17_, &_tmp18_);
-#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		abilities = _tmp18_;
-#line 723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		res = _tmp19_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = res;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp20_ != GP_OK) {
-#line 5475 "ImportPage.c"
+#line 5540 "ImportPage.c"
 			int _tmp21_ = 0;
 			gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
-#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = res;
-#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = gp_result_to_full_string (_tmp21_);
-#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = _tmp22_;
-#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_debug ("ImportPage.vala:725: Unable to get camera abilities: %s", _tmp23_);
-#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp23_);
+#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp23_);
-#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = _ ("Camera");
-#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = g_strdup (_tmp24_);
-#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (self->priv->camera_name);
-#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			self->priv->camera_name = _tmp25_;
-#line 5499 "ImportPage.c"
+#line 5564 "ImportPage.c"
 		}
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 5503 "ImportPage.c"
+#line 5568 "ImportPage.c"
 	}
-#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->camera_label;
-#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp27_ = self->priv->camera_name;
-#line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_label_set_text (_tmp26_, _tmp27_);
-#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp28_ = self->priv->camera_name;
-#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp28_);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp29_ = g_volume_monitor_get ();
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->volume_monitor);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->volume_monitor = _tmp29_;
-#line 736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp30_ = import_page_null_context;
-#line 736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp30_ == NULL) {
-#line 5525 "ImportPage.c"
+#line 5590 "ImportPage.c"
 		GPContextWrapper* _tmp31_ = NULL;
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = gp_context_wrapper_new ();
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_null_context);
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_null_context = _tmp31_;
-#line 5533 "ImportPage.c"
+#line 5598 "ImportPage.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp32_ = import_page_spin_idle_context;
-#line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp32_ == NULL) {
-#line 5539 "ImportPage.c"
+#line 5604 "ImportPage.c"
 		GPSpinIdleWrapper* _tmp33_ = NULL;
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = gp_spin_idle_wrapper_new ();
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_spin_idle_context);
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_spin_idle_context = _tmp33_;
-#line 5547 "ImportPage.c"
+#line 5612 "ImportPage.c"
 	}
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp35_ = _tmp34_;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp36_ = self->priv->import_sources;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp37_ = import_page_import_view_manager_new (self);
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp38_ = _tmp37_;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp39_ = view_collection_monitor_source_collection (_tmp35_, _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp40_ = _tmp39_;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_collection_monitor_unref0 (_tmp40_);
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_manager_unref0 (_tmp38_);
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp35_);
-#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp42_ = _tmp41_;
-#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
-#line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp42_);
-#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp44_ = _tmp43_;
-#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp44_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
-#line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp44_);
-#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp46_ = _tmp45_;
-#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
-#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp46_);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp48_ = _tmp47_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp48_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp49_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp50_ = _tmp49_;
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_value_init (&_tmp51_, G_TYPE_BOOLEAN);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_value_set_boolean (&_tmp51_, TRUE);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp51_, NULL, NULL);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp50_);
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp52_ = library_photo_global;
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp53_ = video_global;
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 761 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
-#line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	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"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5629 "ImportPage.c"
+#line 5694 "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"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5636 "ImportPage.c"
+#line 5701 "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"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_hide_imported ((ImportPage*) self);
-#line 5643 "ImportPage.c"
+#line 5708 "ImportPage.c"
 }
 
 
@@ -5648,15 +5713,15 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	ImportPage * self;
 	GtkToolbar* result = NULL;
 	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp50_ = NULL;
-	GtkToolbar* _tmp51_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	GtkToolbar* _tmp59_ = NULL;
+	GtkToolbar* _tmp60_ = NULL;
+#line 778 "/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"
+#line 779 "/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"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 5659 "ImportPage.c"
+#line 5724 "ImportPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -5694,244 +5759,285 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 		GtkToggleToolButton* find_button = NULL;
 		GtkToggleToolButton* _tmp32_ = NULL;
 		GtkToggleToolButton* _tmp33_ = NULL;
-		GtkToolbar* _tmp34_ = NULL;
-		GtkToggleToolButton* _tmp35_ = NULL;
-		GtkToolbar* _tmp36_ = NULL;
-		GtkSeparatorToolItem* _tmp37_ = NULL;
+		GtkToggleToolButton* _tmp34_ = NULL;
+		GtkToolbar* _tmp35_ = NULL;
+		GtkToggleToolButton* _tmp36_ = NULL;
+		GtkToolbar* _tmp37_ = NULL;
 		GtkSeparatorToolItem* _tmp38_ = NULL;
+		GtkSeparatorToolItem* _tmp39_ = NULL;
 		GtkToolButton* import_selected_button = NULL;
-		GtkToolButton* _tmp39_ = NULL;
 		GtkToolButton* _tmp40_ = NULL;
 		GtkToolButton* _tmp41_ = NULL;
-		GtkToolbar* _tmp42_ = NULL;
-		GtkToolButton* _tmp43_ = NULL;
-		GtkToolButton* import_all_button = NULL;
+		GtkToolButton* _tmp42_ = NULL;
+		const gchar* _tmp43_ = NULL;
 		GtkToolButton* _tmp44_ = NULL;
 		GtkToolButton* _tmp45_ = NULL;
 		GtkToolButton* _tmp46_ = NULL;
 		GtkToolbar* _tmp47_ = NULL;
 		GtkToolButton* _tmp48_ = NULL;
-		GtkProgressBar* _tmp49_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		GtkToolButton* import_all_button = NULL;
+		GtkToolButton* _tmp49_ = NULL;
+		GtkToolButton* _tmp50_ = NULL;
+		GtkToolButton* _tmp51_ = NULL;
+		const gchar* _tmp52_ = NULL;
+		GtkToolButton* _tmp53_ = NULL;
+		GtkToolButton* _tmp54_ = NULL;
+		GtkToolButton* _tmp55_ = NULL;
+		GtkToolbar* _tmp56_ = NULL;
+		GtkToolButton* _tmp57_ = NULL;
+		GtkProgressBar* _tmp58_ = NULL;
+#line 780 "/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"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp1_;
-#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _ ("Hide photos already imported");
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp3_);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp4_);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->hide_imported);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->hide_imported = _tmp4_;
-#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = self->priv->hide_imported;
-#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _ ("Only display photos that have not been imported");
-#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->hide_imported;
-#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
-#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
-#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->hide_imported;
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = config_facade_get_instance ();
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = _tmp10_;
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp12_);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = gtk_tool_item_new ();
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp13_);
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		hide_item = _tmp13_;
-#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = hide_item;
-#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_is_important (_tmp14_, TRUE);
-#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = hide_item;
-#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = self->priv->hide_imported;
-#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.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 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = hide_item;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp17_, _tmp18_, -1);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp19_);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		separator = _tmp19_;
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = separator;
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_separator_tool_item_set_draw (_tmp20_, FALSE);
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = separator;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = self->priv->progress_bar;
-#line 793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
-#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = self->priv->progress_bar;
-#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = gtk_tool_item_new ();
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp25_);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		progress_item = _tmp25_;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = progress_item;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_expand (_tmp26_, TRUE);
-#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = progress_item;
-#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = self->priv->progress_bar;
-#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = self->priv->progress_bar;
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_show_text (_tmp29_, TRUE);
-#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = progress_item;
-#line 800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp30_, _tmp31_, -1);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp32_);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		find_button = _tmp32_;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp33_ = find_button;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		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"
-		_tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp35_ = find_button;
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		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"
-		_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp37_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp37_);
-#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp38_ = _tmp37_;
-#line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		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 (_tmp38_);
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp39_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp39_);
+		_tmp33_ = find_button;
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_selected_button = _tmp39_;
+		gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp40_ = import_selected_button;
+		_tmp34_ = find_button;
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp40_, RESOURCES_IMPORT);
-#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp41_ = import_selected_button;
-#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		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"
-		_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = import_selected_button;
-#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		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"
-		_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp44_);
-#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_all_button = _tmp44_;
-#line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = import_all_button;
-#line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_IMPORT_ALL);
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp36_ = find_button;
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp38_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_object_ref_sink (_tmp38_);
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp39_ = _tmp38_;
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_object_unref0 (_tmp39_);
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp40_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp46_ = import_all_button;
+		g_object_ref_sink (_tmp40_);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
+		import_selected_button = _tmp40_;
+#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp41_ = import_selected_button;
+#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_icon_name (_tmp41_, "import");
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp42_ = import_selected_button;
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp48_ = import_all_button;
+		_tmp43_ = _ ("Import _Selected");
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_label (_tmp42_, _tmp43_);
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp44_ = import_selected_button;
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp45_ = import_selected_button;
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_use_underline (_tmp45_, TRUE);
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp46_ = import_selected_button;
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp48_ = import_selected_button;
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		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"
-		_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 (_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"
+		_tmp49_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_object_ref_sink (_tmp49_);
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		import_all_button = _tmp49_;
+#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp50_ = import_all_button;
+#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_icon_name (_tmp50_, "import-all");
+#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp51_ = import_all_button;
+#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp52_ = _ ("Import _All");
+#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_label (_tmp51_, _tmp52_);
+#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp53_ = import_all_button;
+#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp54_ = import_all_button;
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_tool_button_set_use_underline (_tmp54_, TRUE);
+#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp55_ = import_all_button;
+#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
+#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp57_ = import_all_button;
+#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_toolbar_insert (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp58_ = self->priv->progress_bar;
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		import_page_update_toolbar_state (self);
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (import_all_button);
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (import_selected_button);
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (find_button);
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (progress_item);
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (separator);
-#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (hide_item);
-#line 5917 "ImportPage.c"
-	}
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp51_ = _g_object_ref0 (_tmp50_);
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp51_;
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 6023 "ImportPage.c"
+	}
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp60_ = _g_object_ref0 (_tmp59_);
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	result = _tmp60_;
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5927 "ImportPage.c"
+#line 6033 "ImportPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 5934 "ImportPage.c"
+#line 6040 "ImportPage.c"
 }
 
 
@@ -5940,17 +6046,17 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
 	CoreViewTracker* result = NULL;
 	CameraViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5953 "ImportPage.c"
+#line 6059 "ImportPage.c"
 }
 
 
@@ -5959,17 +6065,17 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = _ ("The camera seems to be empty. No photos/videos found to import");
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5972 "ImportPage.c"
+#line 6078 "ImportPage.c"
 }
 
 
@@ -5978,17 +6084,17 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = _ ("No new photos/videos found on camera");
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5991 "ImportPage.c"
+#line 6097 "ImportPage.c"
 }
 
 
@@ -6003,33 +6109,33 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
 	ImportSource* _tmp6_ = NULL;
 	time_t _tmp7_ = 0;
 	gint64 _tmp8_ = 0LL;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = a;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_source_get_exposure_time (_tmp2_);
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = b;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp4_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = _tmp5_;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = import_source_get_exposure_time (_tmp6_);
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = (gint64) (_tmp3_ - _tmp7_);
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp8_;
-#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6032 "ImportPage.c"
+#line 6138 "ImportPage.c"
 }
 
 
@@ -6037,19 +6143,19 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
 	gboolean result = FALSE;
 	Alteration* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = alteration;
-#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time");
-#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6052 "ImportPage.c"
+#line 6158 "ImportPage.c"
 }
 
 
@@ -6059,21 +6165,21 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
 	time_t _tmp1_ = 0;
 	void* _tmp2_ = NULL;
 	time_t _tmp3_ = 0;
-#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = a;
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = b;
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp2_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = (gint64) (_tmp1_ - _tmp3_);
-#line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6076 "ImportPage.c"
+#line 6182 "ImportPage.c"
 }
 
 
@@ -6081,72 +6187,119 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
 	ImportPage * self;
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = ui_filenames;
-#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_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), _tmp0_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = ui_filenames;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6096 "ImportPage.c"
+#line 6202 "ImportPage.c"
 }
 
 
 static GVariant* _variant_new15 (gboolean value) {
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6103 "ImportPage.c"
+#line 6209 "ImportPage.c"
 }
 
 
-static void import_page_real_add_actions (Page* base) {
+static void import_page_real_add_actions (Page* base, GActionMap* map) {
 	ImportPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	GAction* _tmp3_ = NULL;
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	GVariant* _tmp7_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#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"
+#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp0_ = map;
+#line 891 "/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), _tmp0_);
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp1_ = map;
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_action_map_add_action_entries (_tmp1_, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self);
+#line 895 "/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"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _tmp4_;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _variant_new15 (_tmp6_);
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 6149 "ImportPage.c"
+#line 6255 "ImportPage.c"
+}
+
+
+static void import_page_real_remove_actions (Page* base, GActionMap* map) {
+	ImportPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
+#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp0_ = map;
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 6270 "ImportPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		entry_collection = IMPORT_PAGE_entries;
+#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries);
+#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) {
+#line 6282 "ImportPage.c"
+			GActionEntry entry = {0};
+#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			entry = entry_collection[entry_it];
+#line 6286 "ImportPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp1_ = map;
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp2_ = entry;
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 6299 "ImportPage.c"
+			}
+		}
+	}
 }
 
 
@@ -6154,17 +6307,17 @@ Camera* import_page_get_camera (ImportPage* self) {
 	Camera* result = NULL;
 	Camera* _tmp0_ = NULL;
 	Camera* _tmp1_ = NULL;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6167 "ImportPage.c"
+#line 6320 "ImportPage.c"
 }
 
 
@@ -6172,32 +6325,32 @@ gchar* import_page_get_uri (ImportPage* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->uri;
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6185 "ImportPage.c"
+#line 6338 "ImportPage.c"
 }
 
 
 gboolean import_page_is_busy (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6200 "ImportPage.c"
+#line 6353 "ImportPage.c"
 }
 
 
@@ -6205,21 +6358,21 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
 	ImportPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 896 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE);
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = selected_count;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = count;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/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 6222 "ImportPage.c"
+#line 6375 "ImportPage.c"
 }
 
 
@@ -6227,29 +6380,29 @@ gboolean import_page_is_refreshed (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6236 "ImportPage.c"
+#line 6389 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp2_;
-#line 6242 "ImportPage.c"
+#line 6395 "ImportPage.c"
 	} else {
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6246 "ImportPage.c"
+#line 6399 "ImportPage.c"
 	}
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6252 "ImportPage.c"
+#line 6405 "ImportPage.c"
 }
 
 
@@ -6257,130 +6410,130 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 	gchar* result = NULL;
 	gchar* msg = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	msg = NULL;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refresh_error;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6268 "ImportPage.c"
+#line 6421 "ImportPage.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->refresh_error;
-#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = g_strdup (_tmp1_);
-#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (msg);
-#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6279 "ImportPage.c"
+#line 6432 "ImportPage.c"
 	} else {
 		int _tmp3_ = 0;
-#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refresh_result;
-#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ == GP_OK) {
-#line 6286 "ImportPage.c"
+#line 6439 "ImportPage.c"
 		} else {
 			int _tmp4_ = 0;
 			gchar* _tmp5_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refresh_result;
-#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = gp_result_to_full_string (_tmp4_);
-#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (msg);
-#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6298 "ImportPage.c"
+#line 6451 "ImportPage.c"
 		}
 	}
-#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = msg;
-#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6305 "ImportPage.c"
+#line 6458 "ImportPage.c"
 }
 
 
 static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = busy;
-#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->busy = _tmp0_;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = refreshed;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refreshed = _tmp1_;
-#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 6324 "ImportPage.c"
+#line 6477 "ImportPage.c"
 }
 
 
 static void import_page_update_toolbar_state (ImportPage* self) {
 	GtkCheckButton* _tmp0_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6336 "ImportPage.c"
+#line 6489 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 		GtkCheckButton* _tmp8_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->busy;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6345 "ImportPage.c"
+#line 6498 "ImportPage.c"
 			gboolean _tmp4_ = FALSE;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refreshed;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = _tmp4_;
-#line 6351 "ImportPage.c"
+#line 6504 "ImportPage.c"
 		} else {
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6355 "ImportPage.c"
+#line 6508 "ImportPage.c"
 		}
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6359 "ImportPage.c"
+#line 6512 "ImportPage.c"
 			ViewCollection* _tmp5_ = NULL;
 			ViewCollection* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _tmp5_;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = view_collection_get_unfiltered_count (_tmp6_);
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = _tmp7_ > 0;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_data_collection_unref0 (_tmp6_);
-#line 6373 "ImportPage.c"
+#line 6526 "ImportPage.c"
 		} else {
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6377 "ImportPage.c"
+#line 6530 "ImportPage.c"
 		}
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 952 "/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 6383 "ImportPage.c"
+#line 6536 "ImportPage.c"
 	}
 }
 
@@ -6394,129 +6547,129 @@ static void import_page_on_view_changed (ImportPage* self) {
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6403 "ImportPage.c"
+#line 6556 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refreshed;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp3_;
-#line 6409 "ImportPage.c"
+#line 6562 "ImportPage.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6413 "ImportPage.c"
+#line 6566 "ImportPage.c"
 	}
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6417 "ImportPage.c"
+#line 6570 "ImportPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp4_;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 6431 "ImportPage.c"
+#line 6584 "ImportPage.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6435 "ImportPage.c"
+#line 6588 "ImportPage.c"
 	}
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->busy;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp9_) {
-#line 6443 "ImportPage.c"
+#line 6596 "ImportPage.c"
 		gboolean _tmp10_ = FALSE;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refreshed;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp10_;
-#line 6449 "ImportPage.c"
+#line 6602 "ImportPage.c"
 	} else {
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6453 "ImportPage.c"
+#line 6606 "ImportPage.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6457 "ImportPage.c"
+#line 6610 "ImportPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp13_ > 0;
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 6471 "ImportPage.c"
+#line 6624 "ImportPage.c"
 	} else {
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6475 "ImportPage.c"
+#line 6628 "ImportPage.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = self->priv->busy;
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp15_) {
-#line 6483 "ImportPage.c"
+#line 6636 "ImportPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = _tmp16_;
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = _tmp18_ > 0;
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 6497 "ImportPage.c"
+#line 6650 "ImportPage.c"
 	} else {
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6501 "ImportPage.c"
+#line 6654 "ImportPage.c"
 	}
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 958 "/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"
+#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_toolbar_state (self);
-#line 6507 "ImportPage.c"
+#line 6660 "ImportPage.c"
 }
 
 
 static void import_page_on_media_added_removed (ImportPage* self) {
 	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 964 "/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 6519 "ImportPage.c"
+#line 6672 "ImportPage.c"
 }
 
 
@@ -6528,33 +6681,33 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/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"
+#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	display = _tmp1_;
-#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/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 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/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 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = action;
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = value;
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6557 "ImportPage.c"
+#line 6710 "ImportPage.c"
 }
 
 
@@ -6563,36 +6716,36 @@ static void import_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 954 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/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 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/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 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 979 "/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 6580 "ImportPage.c"
+#line 6733 "ImportPage.c"
 }
 
 
 static void import_page_real_ready (Page* base) {
 	ImportPage * self;
 	ImportPageHideImportedViewFilter* _tmp0_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, FALSE);
-#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported_filter;
-#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 984 "/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 6595 "ImportPage.c"
+#line 6748 "ImportPage.c"
 }
 
 
@@ -6603,50 +6756,50 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 	ImportPageRefreshResult _tmp3_ = 0;
 	ImportPageRefreshResult _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 6614 "ImportPage.c"
+#line 6767 "ImportPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6621 "ImportPage.c"
+#line 6774 "ImportPage.c"
 	}
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 6627 "ImportPage.c"
+#line 6780 "ImportPage.c"
 	}
-#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
-#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (_tmp4_) {
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_OK:
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6641 "ImportPage.c"
+#line 6794 "ImportPage.c"
 		{
-#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6645 "ImportPage.c"
+#line 6798 "ImportPage.c"
 		}
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6649 "ImportPage.c"
+#line 6802 "ImportPage.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			const gchar* _tmp6_ = NULL;
@@ -6655,89 +6808,89 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			GFile* _tmp8_ = NULL;
 			GMount* mount = NULL;
 			GMount* _tmp13_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = fail_on_locked;
-#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp5_) {
-#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 6666 "ImportPage.c"
+#line 6819 "ImportPage.c"
 			}
-#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
-#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"
+#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_debug ("ImportPage.vala:1008: Checking if %s is mounted…", _tmp6_);
+#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = self->priv->uri;
-#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			uri = _tmp8_;
-#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			mount = NULL;
-#line 6680 "ImportPage.c"
+#line 6833 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				GMount* _tmp11_ = NULL;
 				GMount* _tmp12_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = uri;
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = _tmp11_;
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6694 "ImportPage.c"
-					goto __catch62_g_error;
+#line 6847 "ImportPage.c"
+					goto __catch64_g_error;
 				}
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				mount = _tmp12_;
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp9_);
-#line 6707 "ImportPage.c"
+#line 6860 "ImportPage.c"
 			}
-			goto __finally62;
-			__catch62_g_error:
+			goto __finally64;
+			__catch64_g_error:
 			{
 				GError* err = NULL;
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 6719 "ImportPage.c"
+#line 6872 "ImportPage.c"
 			}
-			__finally62:
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally64:
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (uri);
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/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 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 6734 "ImportPage.c"
+#line 6887 "ImportPage.c"
 			}
-#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = mount;
-#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp13_ != NULL) {
-#line 6740 "ImportPage.c"
+#line 6893 "ImportPage.c"
 				gchar* mounted_message = NULL;
 				const gchar* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
@@ -6755,73 +6908,73 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				gint _tmp25_ = 0;
 				GtkMessageDialog* _tmp26_ = NULL;
 				gint _tmp27_ = 0;
-#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1021 "/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 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = g_strdup (_tmp14_);
-#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				mounted_message = _tmp15_;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = app_window_get_instance ();
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = _tmp16_;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = mounted_message;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/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 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_object_ref_sink (_tmp19_);
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp20_ = _tmp19_;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp17_);
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog = _tmp20_;
-#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = dialog;
-#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1026 "/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 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = dialog;
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = _ ("_Unmount");
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/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 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = dialog;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_dialog_get_type (), GtkDialog));
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog_res = _tmp25_;
-#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = dialog;
-#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = dialog_res;
-#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6804 "ImportPage.c"
+#line 6957 "ImportPage.c"
 					const gchar* _tmp28_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = _ ("Please unmount the camera.");
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1032 "/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 6810 "ImportPage.c"
+#line 6963 "ImportPage.c"
 				} else {
 					GMount* _tmp29_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = mount;
-#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					import_page_unmount_camera (self, _tmp29_);
-#line 6817 "ImportPage.c"
+#line 6970 "ImportPage.c"
 				}
-#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (mounted_message);
-#line 6823 "ImportPage.c"
+#line 6976 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
 				const gchar* _tmp30_ = NULL;
@@ -6836,115 +6989,115 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				GtkMessageDialog* _tmp38_ = NULL;
 				GtkMessageDialog* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1037 "/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 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = g_strdup (_tmp30_);
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				locked_message = _tmp31_;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = _tmp32_;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = locked_message;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/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 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_object_ref_sink (_tmp35_);
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp36_ = _tmp35_;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog = _tmp36_;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp37_ = dialog;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1043 "/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 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp38_ = dialog;
-#line 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_dialog_get_type (), GtkDialog));
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp39_ = dialog;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp40_ = _ ("Please close any other application using the camera.");
-#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1047 "/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 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 6880 "ImportPage.c"
+#line 7033 "ImportPage.c"
 			}
-#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
-#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (uri);
-#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6888 "ImportPage.c"
+#line 7041 "ImportPage.c"
 		}
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 6892 "ImportPage.c"
+#line 7045 "ImportPage.c"
 		{
 			const gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			gchar* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
 			gchar* _tmp45_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp41_ = _ ("Unable to fetch previews from the camera:\n%s");
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp42_ = import_page_get_refresh_message (self);
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp43_ = _tmp42_;
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp44_ = g_strdup_printf (_tmp41_, _tmp43_);
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp45_ = _tmp44_;
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			app_window_error_message (_tmp45_, NULL);
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp45_);
-#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp43_);
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6917 "ImportPage.c"
+#line 7070 "ImportPage.c"
 		}
 		default:
 		{
 			ImportPageRefreshResult _tmp46_ = 0;
-#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp46_ = res;
-#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_error ("ImportPage.vala:1035: Unknown result type %d", (gint) _tmp46_);
-#line 6926 "ImportPage.c"
+#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_);
+#line 7079 "ImportPage.c"
 		}
 	}
 }
 
 
 static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 6935 "ImportPage.c"
+#line 7088 "ImportPage.c"
 }
 
 
 static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_unref (self);
-#line 6944 "ImportPage.c"
+#line 7097 "ImportPage.c"
 }
 
 
@@ -6962,67 +7115,67 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	AppWindow* _tmp9_ = NULL;
 	GtkMountOperation* _tmp10_ = NULL;
 	GtkMountOperation* _tmp11_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 6974 "ImportPage.c"
+#line 7127 "ImportPage.c"
 	}
-#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/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 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp2_, 0.0);
-#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE);
-#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = self->priv->progress_bar;
-#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _ ("Unmounting…");
-#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = mount;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1074 "/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 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"
+#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1076: Unmounting camera…");
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = mount;
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/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 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/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 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7022 "ImportPage.c"
+#line 7175 "ImportPage.c"
 }
 
 
@@ -7031,35 +7184,35 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 	GObject* _tmp0_ = NULL;
 	GMount* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail ((source == NULL) || G_IS_OBJECT (source));
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_ASYNC_RESULT (aresult));
-#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"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1084: Async unmount finished");
+#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = source;
-#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
-#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	mount = _tmp1_;
-#line 7045 "ImportPage.c"
+#line 7198 "ImportPage.c"
 	{
 		GAsyncResult* _tmp2_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = aresult;
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7054 "ImportPage.c"
-			goto __catch63_g_error;
+#line 7207 "ImportPage.c"
+			goto __catch65_g_error;
 		}
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally65;
+	__catch65_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_ = 0U;
@@ -7067,52 +7220,52 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		GtkProgressBar* _tmp5_ = NULL;
 		GtkProgressBar* _tmp6_ = NULL;
 		GtkProgressBar* _tmp7_ = NULL;
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE);
-#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1093 "/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 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->refreshed;
-#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, _tmp4_);
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = self->priv->progress_bar;
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE);
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = self->priv->progress_bar;
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_text (_tmp6_, "");
-#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->progress_bar;
-#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1098 "/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 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 7095 "ImportPage.c"
+#line 7248 "ImportPage.c"
 	}
-	__finally63:
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally65:
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (mount);
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/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 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 7108 "ImportPage.c"
+#line 7261 "ImportPage.c"
 	}
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7112 "ImportPage.c"
+#line 7265 "ImportPage.c"
 }
 
 
@@ -7121,31 +7274,31 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
 	GtkProgressBar* _tmp1_ = NULL;
 	GtkProgressBar* _tmp2_ = NULL;
 	GtkProgressBar* _tmp3_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_MOUNT (mount));
-#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"
+#line 1103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1103: on_unmounted");
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refreshed;
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp0_);
-#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp1_, PANGO_ELLIPSIZE_NONE);
-#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp2_, "");
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1108 "/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 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, TRUE);
-#line 7145 "ImportPage.c"
+#line 7298 "ImportPage.c"
 }
 
 
@@ -7154,23 +7307,23 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 	SourceCollection* _tmp0_ = NULL;
 	Marker* _tmp1_ = NULL;
 	SourceCollection* _tmp2_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->import_sources;
-#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp1_;
-#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker_mark_all (marker);
-#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->import_sources;
-#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
-#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 7170 "ImportPage.c"
+#line 7323 "ImportPage.c"
 }
 
 
@@ -7204,93 +7357,93 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	gint list_len = 0;
 	CameraList* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (search_target != NULL, FALSE);
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	fulldir = _tmp4_;
-#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = gp_list_new (&_tmp5_);
-#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	folders = _tmp5_;
-#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp6_;
-#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _result_;
-#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7242 "ImportPage.c"
+#line 7395 "ImportPage.c"
 	}
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fulldir;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = folders;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = import_page_spin_idle_context;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_);
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp13_;
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = _result_;
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp14_ != GP_OK) {
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7270 "ImportPage.c"
+#line 7423 "ImportPage.c"
 	}
-#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
-#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = gp_list_count (_tmp15_);
-#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	list_len = _tmp16_;
-#line 7278 "ImportPage.c"
+#line 7431 "ImportPage.c"
 	{
 		gint list_index = 0;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7283 "ImportPage.c"
+#line 7436 "ImportPage.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = TRUE;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 7290 "ImportPage.c"
+#line 7443 "ImportPage.c"
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gchar* tmp = NULL;
@@ -7300,73 +7453,73 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				gchar* _tmp24_ = NULL;
 				const gchar* _tmp25_ = NULL;
 				const gchar* _tmp26_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7302 "ImportPage.c"
+#line 7455 "ImportPage.c"
 					gint _tmp18_ = 0;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = list_index;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					list_index = _tmp18_ + 1;
-#line 7308 "ImportPage.c"
+#line 7461 "ImportPage.c"
 				}
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = list_index;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp20_ = list_len;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp19_ < _tmp20_)) {
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 7320 "ImportPage.c"
+#line 7473 "ImportPage.c"
 				}
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = list_index;
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = g_strdup (_tmp23_);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				tmp = _tmp24_;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = tmp;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = search_target;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
-#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = TRUE;
-#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (tmp);
-#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 7350 "ImportPage.c"
+#line 7503 "ImportPage.c"
 				}
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7354 "ImportPage.c"
+#line 7507 "ImportPage.c"
 			}
 		}
 	}
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7366 "ImportPage.c"
+#line 7519 "ImportPage.c"
 }
 
 
@@ -7411,143 +7564,143 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	int _tmp85_ = 0;
 	int _tmp89_ = 0;
 	int _tmp94_ = 0;
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
-#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
-#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7421 "ImportPage.c"
+#line 7574 "ImportPage.c"
 	}
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _ ("Starting import, please wait…");
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1160 "/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 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, _tmp2_, FALSE);
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->camera;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_spin_idle_context;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = gp_camera_init (_tmp3_, _tmp5_);
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp6_;
-#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = self->priv->refresh_result;
-#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 7449 "ImportPage.c"
+#line 7602 "ImportPage.c"
 		int _tmp8_ = 0;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		ImportPageRefreshResult _tmp11_ = 0;
 		int _tmp12_ = 0;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->refresh_result;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = gp_result_to_full_string (_tmp8_);
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#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"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp10_);
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = self->priv->refresh_result;
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ == GP_ERROR_IO_LOCK) {
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7471 "ImportPage.c"
+#line 7624 "ImportPage.c"
 		} else {
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7475 "ImportPage.c"
+#line 7628 "ImportPage.c"
 		}
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp11_;
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7481 "ImportPage.c"
+#line 7634 "ImportPage.c"
 	}
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->refreshed;
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, _tmp13_);
-#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = self->priv->progress_bar;
-#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp14_, PANGO_ELLIPSIZE_NONE);
-#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = self->priv->progress_bar;
-#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = _ ("Fetching photo information");
-#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp16_);
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = self->priv->progress_bar;
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp17_, 0.0);
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp18_ = self->priv->progress_bar;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_pulse_step (_tmp18_, 0.01);
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = self->priv->progress_bar;
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1180 "/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 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1182 "/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 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_list = _tmp20_;
-#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp21_ = self->priv->camera;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp22_ = import_page_spin_idle_context;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp25_ = gp_camera_get_storageinfo (_tmp21_, &sifs, &_tmp24_, _tmp23_);
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = _tmp24_;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp25_;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->refresh_result;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ == GP_OK) {
-#line 7535 "ImportPage.c"
+#line 7688 "ImportPage.c"
 		{
 			gint fsid = 0;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7540 "ImportPage.c"
+#line 7693 "ImportPage.c"
 			{
 				gboolean _tmp27_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = TRUE;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7547 "ImportPage.c"
+#line 7700 "ImportPage.c"
 					gint _tmp29_ = 0;
 					gint _tmp30_ = 0;
 					gboolean got_well_known_dir = FALSE;
@@ -7572,381 +7725,381 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					gint _tmp67_ = 0;
 					gboolean _tmp68_ = FALSE;
 					gboolean _tmp71_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp27_) {
-#line 7574 "ImportPage.c"
+#line 7727 "ImportPage.c"
 						gint _tmp28_ = 0;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp28_ = fsid;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						fsid = _tmp28_ + 1;
-#line 7580 "ImportPage.c"
+#line 7733 "ImportPage.c"
 					}
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = fsid;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = count;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!(_tmp29_ < _tmp30_)) {
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7592 "ImportPage.c"
+#line 7745 "ImportPage.c"
 					}
-#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp31_ = fsid;
-#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
-#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp32_) {
-#line 7602 "ImportPage.c"
+#line 7755 "ImportPage.c"
 						gint _tmp33_ = 0;
 						GeeArrayList* _tmp34_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp33_ = fsid;
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp34_ = import_list;
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
-#line 1175 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7613 "ImportPage.c"
+#line 7766 "ImportPage.c"
 					}
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = fsid;
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp36_) {
-#line 7621 "ImportPage.c"
+#line 7774 "ImportPage.c"
 						gint _tmp37_ = 0;
 						GeeArrayList* _tmp38_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp37_ = fsid;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp38_ = import_list;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7632 "ImportPage.c"
+#line 7785 "ImportPage.c"
 					}
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = fsid;
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_) {
-#line 7640 "ImportPage.c"
+#line 7793 "ImportPage.c"
 						gint _tmp41_ = 0;
 						GeeArrayList* _tmp42_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = fsid;
-#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = import_list;
-#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7651 "ImportPage.c"
+#line 7804 "ImportPage.c"
 					}
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp44_) {
-#line 7659 "ImportPage.c"
+#line 7812 "ImportPage.c"
 						gint _tmp45_ = 0;
 						GeeArrayList* _tmp46_ = NULL;
-#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp45_ = fsid;
-#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp46_ = import_list;
-#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
-#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7670 "ImportPage.c"
+#line 7823 "ImportPage.c"
 					}
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = fsid;
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp48_) {
-#line 7678 "ImportPage.c"
+#line 7831 "ImportPage.c"
 						gint _tmp49_ = 0;
 						GeeArrayList* _tmp50_ = NULL;
-#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = fsid;
-#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp50_ = import_list;
-#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
-#line 1194 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7689 "ImportPage.c"
+#line 7842 "ImportPage.c"
 					}
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = fsid;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 7697 "ImportPage.c"
+#line 7850 "ImportPage.c"
 						gint _tmp53_ = 0;
 						GeeArrayList* _tmp54_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp53_ = fsid;
-#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = import_list;
-#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
-#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7708 "ImportPage.c"
+#line 7861 "ImportPage.c"
 					}
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = fsid;
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp56_) {
-#line 7716 "ImportPage.c"
+#line 7869 "ImportPage.c"
 						gint _tmp57_ = 0;
 						GeeArrayList* _tmp58_ = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = fsid;
-#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp58_ = import_list;
-#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
-#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7727 "ImportPage.c"
+#line 7880 "ImportPage.c"
 					}
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = fsid;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp60_) {
-#line 7735 "ImportPage.c"
+#line 7888 "ImportPage.c"
 						gint _tmp61_ = 0;
 						GeeArrayList* _tmp62_ = NULL;
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = fsid;
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = import_list;
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
-#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7746 "ImportPage.c"
+#line 7899 "ImportPage.c"
 					}
-#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = fsid;
-#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
-#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp64_) {
-#line 7754 "ImportPage.c"
+#line 7907 "ImportPage.c"
 						gint _tmp65_ = 0;
 						GeeArrayList* _tmp66_ = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp65_ = fsid;
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = import_list;
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7765 "ImportPage.c"
+#line 7918 "ImportPage.c"
 					}
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp67_ = fsid;
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp68_) {
-#line 7773 "ImportPage.c"
+#line 7926 "ImportPage.c"
 						gint _tmp69_ = 0;
 						GeeArrayList* _tmp70_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = fsid;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = import_list;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7784 "ImportPage.c"
+#line 7937 "ImportPage.c"
 					}
-#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp71_ = got_well_known_dir;
-#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp71_) {
-#line 7790 "ImportPage.c"
+#line 7943 "ImportPage.c"
 						gint _tmp72_ = 0;
 						GeeArrayList* _tmp73_ = NULL;
 						gboolean _tmp74_ = FALSE;
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = fsid;
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = import_list;
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = import_page_enumerate_files (self, _tmp72_, "/", _tmp73_);
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp74_) {
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 7804 "ImportPage.c"
+#line 7957 "ImportPage.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_clear_all_import_sources (self);
-#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp75_ = import_list;
-#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_auto_match_raw_jpeg (self, _tmp75_);
-#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp76_ = import_list;
-#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/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 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp77_ = self->priv->progress_bar;
-#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1270 "/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 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp78_ = self->priv->progress_bar;
-#line 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp78_, PANGO_ELLIPSIZE_NONE);
-#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp79_ = self->priv->progress_bar;
-#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp79_, "");
-#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp80_ = self->priv->progress_bar;
-#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp80_, 0.0);
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = self->priv->camera;
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp82_ = import_page_spin_idle_context;
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp83_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp84_ = gp_camera_exit (_tmp81_, _tmp83_);
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp84_;
-#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp85_ = res;
-#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp85_ != GP_OK) {
-#line 7851 "ImportPage.c"
+#line 8004 "ImportPage.c"
 		int _tmp86_ = 0;
 		gchar* _tmp87_ = NULL;
 		gchar* _tmp88_ = NULL;
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp86_ = res;
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp87_ = gp_result_to_full_string (_tmp86_);
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp88_ = _tmp87_;
-#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"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_);
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp88_);
-#line 7865 "ImportPage.c"
+#line 8018 "ImportPage.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = self->priv->refresh_result;
-#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp89_ == GP_OK) {
-#line 7871 "ImportPage.c"
+#line 8024 "ImportPage.c"
 		SourceCollection* _tmp90_ = NULL;
 		gint _tmp91_ = 0;
-#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp90_ = self->priv->import_sources;
-#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp91_ == 0) {
-#line 7880 "ImportPage.c"
+#line 8033 "ImportPage.c"
 			gchar* _tmp92_ = NULL;
 			gchar* _tmp93_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1283 "/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 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp93_ = _tmp92_;
-#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1283 "/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 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp93_);
-#line 7891 "ImportPage.c"
+#line 8044 "ImportPage.c"
 		}
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 7895 "ImportPage.c"
+#line 8048 "ImportPage.c"
 	} else {
-#line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, FALSE);
-#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_clear_all_import_sources (self);
-#line 7901 "ImportPage.c"
+#line 8054 "ImportPage.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp94_ = self->priv->refresh_result;
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (_tmp94_) {
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 7911 "ImportPage.c"
+#line 8064 "ImportPage.c"
 		{
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7919 "ImportPage.c"
+#line 8072 "ImportPage.c"
 		}
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 7923 "ImportPage.c"
+#line 8076 "ImportPage.c"
 		{
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7931 "ImportPage.c"
+#line 8084 "ImportPage.c"
 		}
 		default:
 		{
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7941 "ImportPage.c"
+#line 8094 "ImportPage.c"
 		}
 	}
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 7946 "ImportPage.c"
+#line 8099 "ImportPage.c"
 }
 
 
@@ -7954,17 +8107,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7964 "ImportPage.c"
+#line 8117 "ImportPage.c"
 }
 
 
@@ -7985,105 +8138,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 7997 "ImportPage.c"
+#line 8150 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8006 "ImportPage.c"
+#line 8159 "ImportPage.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 8012 "ImportPage.c"
+#line 8165 "ImportPage.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8021 "ImportPage.c"
+#line 8174 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 8027 "ImportPage.c"
+#line 8180 "ImportPage.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8036 "ImportPage.c"
+#line 8189 "ImportPage.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8040 "ImportPage.c"
+#line 8193 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8048 "ImportPage.c"
+#line 8201 "ImportPage.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8057 "ImportPage.c"
+#line 8210 "ImportPage.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8061 "ImportPage.c"
+#line 8214 "ImportPage.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8083 "ImportPage.c"
+#line 8236 "ImportPage.c"
 }
 
 
@@ -8094,71 +8247,71 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gchar* _tmp12_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = str;
-#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	offset = (glong) _tmp2_;
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	while (TRUE) {
-#line 8106 "ImportPage.c"
+#line 8259 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		const gchar* _tmp5_ = NULL;
 		glong _tmp6_ = 0L;
 		gchar _tmp7_ = '\0';
 		gchar _tmp8_ = '\0';
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = offset;
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		offset = _tmp3_ - 1;
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = offset;
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!(_tmp4_ >= ((glong) 0))) {
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 8123 "ImportPage.c"
+#line 8276 "ImportPage.c"
 		}
-#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
-#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = offset;
-#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = string_get (_tmp5_, _tmp6_);
-#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = ch;
-#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_ != _tmp8_) {
-#line 8135 "ImportPage.c"
+#line 8288 "ImportPage.c"
 			const gchar* _tmp9_ = NULL;
 			glong _tmp10_ = 0L;
 			gchar* _tmp11_ = NULL;
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = str;
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = offset;
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_);
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp11_;
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8149 "ImportPage.c"
+#line 8302 "ImportPage.c"
 		}
 	}
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = g_strdup ("");
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp12_;
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8158 "ImportPage.c"
+#line 8311 "ImportPage.c"
 }
 
 
@@ -8167,127 +8320,127 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (basepath != NULL, NULL);
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (addition != NULL, NULL);
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = basepath;
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = g_str_has_suffix (_tmp1_, "/");
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 8177 "ImportPage.c"
+#line 8330 "ImportPage.c"
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = addition;
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8186 "ImportPage.c"
+#line 8339 "ImportPage.c"
 	} else {
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8190 "ImportPage.c"
+#line 8343 "ImportPage.c"
 	}
-#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8194 "ImportPage.c"
+#line 8347 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = basepath;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = g_strconcat (_tmp5_, "/", NULL);
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = addition;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8219 "ImportPage.c"
+#line 8372 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = basepath;
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8230 "ImportPage.c"
+#line 8383 "ImportPage.c"
 			const gchar* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = addition;
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8239 "ImportPage.c"
+#line 8392 "ImportPage.c"
 		} else {
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8243 "ImportPage.c"
+#line 8396 "ImportPage.c"
 		}
-#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8247 "ImportPage.c"
+#line 8400 "ImportPage.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			const gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = basepath;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = import_page_chomp_ch (_tmp16_, '/');
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = _tmp17_;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = addition;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = _tmp20_;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp18_);
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp21_;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8272 "ImportPage.c"
+#line 8425 "ImportPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
 			gchar* _tmp24_ = NULL;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = basepath;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = addition;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp24_;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8287 "ImportPage.c"
+#line 8440 "ImportPage.c"
 		}
 	}
 }
@@ -8313,80 +8466,80 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	CameraStorageInformation* _tmp11_ = NULL;
 	CameraStorageInfoFields _tmp12_ = 0;
 	gchar* _tmp15_ = NULL;
-#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_null_context;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->context;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_);
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = _tmp3_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp4_;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = res;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != GP_OK) {
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8339 "ImportPage.c"
+#line 8492 "ImportPage.c"
 	}
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = count;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ >= _tmp7_) {
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8351 "ImportPage.c"
+#line 8504 "ImportPage.c"
 	}
-#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
-#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fsid;
-#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	ifs = _tmp8_ + _tmp9_;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = ifs;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = (*_tmp11_).fields;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8365 "ImportPage.c"
+#line 8518 "ImportPage.c"
 		CameraStorageInformation* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = ifs;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = (*_tmp13_).basedir;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8374 "ImportPage.c"
+#line 8527 "ImportPage.c"
 	} else {
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8378 "ImportPage.c"
+#line 8531 "ImportPage.c"
 	}
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp15_;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8386 "ImportPage.c"
+#line 8539 "ImportPage.c"
 }
 
 
@@ -8403,74 +8556,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 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1343 "/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 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = folder;
-#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8421 "ImportPage.c"
+#line 8574 "ImportPage.c"
 	}
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = fsid;
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_);
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	basedir = _tmp5_;
-#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = basedir;
-#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ == NULL) {
-#line 8435 "ImportPage.c"
+#line 8588 "ImportPage.c"
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		const gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = camera_name;
-#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = fsid;
-#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"
+#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_debug ("ImportPage.vala:1349: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = folder;
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (basedir);
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8456 "ImportPage.c"
+#line 8609 "ImportPage.c"
 	}
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = folder;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = import_page_append_path (_tmp11_, _tmp12_);
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp13_;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (basedir);
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8470 "ImportPage.c"
+#line 8623 "ImportPage.c"
 }
 
 
@@ -8506,137 +8659,137 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	int _tmp120_ = 0;
 	int _tmp121_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (import_list), FALSE);
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	fulldir = _tmp4_;
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = fulldir;
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ == NULL) {
-#line 8528 "ImportPage.c"
+#line 8681 "ImportPage.c"
 		const gchar* _tmp6_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
-#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"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1360: Skipping enumerating %s: invalid folder name", _tmp6_);
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8540 "ImportPage.c"
+#line 8693 "ImportPage.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	files = _tmp7_;
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp8_;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->refresh_result;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp9_ != GP_OK) {
-#line 8554 "ImportPage.c"
+#line 8707 "ImportPage.c"
 		int _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refresh_result;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = gp_result_to_full_string (_tmp10_);
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#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"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1368: Unable to create file list: %s", _tmp12_);
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp12_);
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8576 "ImportPage.c"
+#line 8729 "ImportPage.c"
 	}
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = fulldir;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = files;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = import_page_spin_idle_context;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp18_;
-#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = self->priv->refresh_result;
-#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 8596 "ImportPage.c"
+#line 8749 "ImportPage.c"
 		const gchar* _tmp20_ = NULL;
 		int _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = fulldir;
-#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = self->priv->refresh_result;
-#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = gp_result_to_full_string (_tmp21_);
-#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = _tmp22_;
-#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"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1375: Unable to list files in %s: %s", _tmp20_, _tmp23_);
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp23_);
-#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8623 "ImportPage.c"
+#line 8776 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8629 "ImportPage.c"
+#line 8782 "ImportPage.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = TRUE;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 8636 "ImportPage.c"
+#line 8789 "ImportPage.c"
 				gint _tmp26_ = 0;
 				CameraList* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
@@ -8647,79 +8800,79 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				int _tmp32_ = 0;
 				gchar* _tmp33_ = NULL;
 				int _tmp34_ = 0;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp24_) {
-#line 8649 "ImportPage.c"
+#line 8802 "ImportPage.c"
 					gint _tmp25_ = 0;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = ctr;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp25_ + 1;
-#line 8655 "ImportPage.c"
+#line 8808 "ImportPage.c"
 				}
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = FALSE;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = ctr;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = files;
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = gp_list_count (_tmp27_);
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp26_ < _tmp28_)) {
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 8669 "ImportPage.c"
+#line 8822 "ImportPage.c"
 				}
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = files;
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = ctr;
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = gp_list_get_name (_tmp29_, _tmp30_, &_tmp31_);
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = g_strdup (_tmp31_);
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				filename = _tmp33_;
-#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				self->priv->refresh_result = _tmp32_;
-#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = self->priv->refresh_result;
-#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp34_ != GP_OK) {
-#line 8689 "ImportPage.c"
+#line 8842 "ImportPage.c"
 					gint _tmp35_ = 0;
 					const gchar* _tmp36_ = NULL;
 					int _tmp37_ = 0;
 					gchar* _tmp38_ = NULL;
 					gchar* _tmp39_ = NULL;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = ctr;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = fulldir;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = self->priv->refresh_result;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp38_ = gp_result_to_full_string (_tmp37_);
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = _tmp38_;
-#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"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1387: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_);
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp39_);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 8719 "ImportPage.c"
+#line 8872 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
@@ -8737,91 +8890,91 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					const gchar* _tmp58_ = NULL;
 					gboolean _tmp59_ = FALSE;
 					GtkProgressBar* _tmp102_ = NULL;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = import_page_spin_idle_context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = self->priv->camera;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = fulldir;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = filename;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = gp_get_info (_tmp42_, _tmp43_, _tmp44_, _tmp45_, &_tmp46_, &_inner_error_);
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					info = _tmp46_;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = _tmp47_;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 8759 "ImportPage.c"
-						goto __catch64_g_error;
+#line 8912 "ImportPage.c"
+						goto __catch66_g_error;
 					}
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
-#line 8764 "ImportPage.c"
+#line 8917 "ImportPage.c"
 						const gchar* _tmp48_ = NULL;
 						const gchar* _tmp49_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = fulldir;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = filename;
-#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"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_warning ("ImportPage.vala:1396: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_);
+#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8779 "ImportPage.c"
+#line 8932 "ImportPage.c"
 					}
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp50_ = info;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = _tmp50_.file;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp51_.fields;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8789 "ImportPage.c"
+#line 8942 "ImportPage.c"
 						const gchar* _tmp53_ = NULL;
 						const gchar* _tmp54_ = NULL;
 						CameraFileInfo _tmp55_ = {0};
 						CameraFileInfoFile _tmp56_ = {0};
 						CameraFileInfoFields _tmp57_ = 0;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp53_ = fulldir;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = filename;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = info;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = _tmp55_.file;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = _tmp56_.fields;
-#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"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_message ("ImportPage.vala:1402: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_);
+#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8813 "ImportPage.c"
+#line 8966 "ImportPage.c"
 					}
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp58_ = filename;
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp59_) {
-#line 8821 "ImportPage.c"
+#line 8974 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
 						const gchar* _tmp60_ = NULL;
 						Camera* _tmp61_ = NULL;
@@ -8837,41 +8990,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						VideoImportSource* _tmp71_ = NULL;
 						GeeArrayList* _tmp72_ = NULL;
 						VideoImportSource* _tmp73_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp60_ = self->priv->camera_name;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = self->priv->camera;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = fsid;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp63_ = dir;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp64_ = filename;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp65_ = info;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = _tmp65_.file;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = _tmp66_.size;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = info;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = _tmp68_.file;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = _tmp69_.mtime;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp71_ = video_import_source_new (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp67_, _tmp70_);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						video_source = _tmp71_;
-#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = import_list;
-#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = video_source;
-#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/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 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (video_source);
-#line 8871 "ImportPage.c"
+#line 9024 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
 						CameraFileInfo _tmp74_ = {0};
@@ -8894,110 +9047,110 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						PhotoFileFormat _tmp99_ = 0;
 						PhotoImportSource* _tmp100_ = NULL;
 						PhotoImportSource* _tmp101_ = NULL;
-#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = info;
-#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp75_ = _tmp74_.file;
-#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp76_ = _tmp75_.type;
-#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp77_ = photo_file_format_from_gphoto_type (_tmp76_);
-#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						file_format = _tmp77_;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp78_ = file_format;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 8908 "ImportPage.c"
+#line 9061 "ImportPage.c"
 							const gchar* _tmp79_ = NULL;
 							PhotoFileFormat _tmp80_ = 0;
 							PhotoFileFormat _tmp81_ = 0;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp79_ = filename;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp80_ = photo_file_format_get_by_basename_extension (_tmp79_);
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							file_format = _tmp80_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp81_ = file_format;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 8922 "ImportPage.c"
+#line 9075 "ImportPage.c"
 								const gchar* _tmp82_ = NULL;
 								const gchar* _tmp83_ = NULL;
 								CameraFileInfo _tmp84_ = {0};
 								CameraFileInfoFile _tmp85_ = {0};
 								const gchar* _tmp86_ = NULL;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp82_ = fulldir;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp83_ = filename;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp84_ = info;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp85_ = _tmp84_.file;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp86_ = _tmp85_.type;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								g_message ("ImportPage.vala:1396: Skipping %s/%s: Not a supported file extension (" \
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								g_message ("ImportPage.vala:1418: Skipping %s/%s: Not a supported file extension (" \
 "%s)", _tmp82_, _tmp83_, _tmp86_);
-#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								 (info);
-#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_g_free0 (filename);
-#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								continue;
-#line 8946 "ImportPage.c"
+#line 9099 "ImportPage.c"
 							}
 						}
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp87_ = import_list;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp88_ = self->priv->camera_name;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp89_ = self->priv->camera;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp90_ = fsid;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp91_ = dir;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp92_ = filename;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp93_ = info;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp94_ = _tmp93_.file;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp95_ = _tmp94_.size;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp96_ = info;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp97_ = _tmp96_.file;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp98_ = _tmp97_.mtime;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp99_ = file_format;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp100_ = photo_import_source_new (_tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp95_, _tmp98_, _tmp99_);
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp101_ = _tmp100_;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/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 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp101_);
-#line 8983 "ImportPage.c"
+#line 9136 "ImportPage.c"
 					}
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = self->priv->progress_bar;
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					gtk_progress_bar_pulse (_tmp102_);
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					spin_event_loop ();
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 8993 "ImportPage.c"
+#line 9146 "ImportPage.c"
 				}
-				goto __finally64;
-				__catch64_g_error:
+				goto __finally66;
+				__catch66_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp103_ = NULL;
@@ -9006,164 +9159,164 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					GError* _tmp106_ = NULL;
 					const gchar* _tmp107_ = NULL;
 					gchar* _tmp108_ = NULL;
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp103_ = fulldir;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp104_ = err;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp105_ = _tmp104_->message;
-#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"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1433: Error while enumerating files in %s: %s", _tmp103_, _tmp105_);
+#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp106_ = err;
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp107_ = _tmp106_->message;
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp108_ = g_strdup (_tmp107_);
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (self->priv->refresh_error);
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					self->priv->refresh_error = _tmp108_;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9039 "ImportPage.c"
+#line 9192 "ImportPage.c"
 				}
-				__finally64:
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally66:
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/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 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return FALSE;
-#line 9056 "ImportPage.c"
+#line 9209 "ImportPage.c"
 				}
-#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9060 "ImportPage.c"
+#line 9213 "ImportPage.c"
 			}
 		}
 	}
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp110_ = gp_list_new (&_tmp109_);
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	folders = _tmp109_;
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp110_;
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp111_ = self->priv->refresh_result;
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp111_ != GP_OK) {
-#line 9076 "ImportPage.c"
+#line 9229 "ImportPage.c"
 		int _tmp112_ = 0;
 		gchar* _tmp113_ = NULL;
 		gchar* _tmp114_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp112_ = self->priv->refresh_result;
-#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp113_ = gp_result_to_full_string (_tmp112_);
-#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp114_ = _tmp113_;
-#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"
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp114_);
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp114_);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9100 "ImportPage.c"
+#line 9253 "ImportPage.c"
 	}
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp115_ = self->priv->camera;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp116_ = fulldir;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp117_ = folders;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp118_ = import_page_spin_idle_context;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp119_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp120_ = gp_camera_folder_list_folders (_tmp115_, _tmp116_, _tmp117_, _tmp119_);
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp120_;
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp121_ = self->priv->refresh_result;
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp121_ != GP_OK) {
-#line 9120 "ImportPage.c"
+#line 9273 "ImportPage.c"
 		const gchar* _tmp122_ = NULL;
 		int _tmp123_ = 0;
 		gchar* _tmp124_ = NULL;
 		gchar* _tmp125_ = NULL;
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp122_ = fulldir;
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp123_ = self->priv->refresh_result;
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp124_ = gp_result_to_full_string (_tmp123_);
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp125_ = _tmp124_;
-#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"
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp122_, _tmp125_);
+#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp125_);
-#line 1432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9149 "ImportPage.c"
+#line 9302 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9155 "ImportPage.c"
+#line 9308 "ImportPage.c"
 		{
 			gboolean _tmp126_ = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp126_ = TRUE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9162 "ImportPage.c"
+#line 9315 "ImportPage.c"
 				gint _tmp128_ = 0;
 				CameraList* _tmp129_ = NULL;
 				gint _tmp130_ = 0;
@@ -9182,151 +9335,151 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				GeeArrayList* _tmp146_ = NULL;
 				gboolean _tmp147_ = FALSE;
 				gboolean _tmp148_ = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp126_) {
-#line 9183 "ImportPage.c"
+#line 9336 "ImportPage.c"
 					gint _tmp127_ = 0;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp127_ = ctr;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp127_ + 1;
-#line 9189 "ImportPage.c"
+#line 9342 "ImportPage.c"
 				}
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp126_ = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp128_ = ctr;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp129_ = folders;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp130_ = gp_list_count (_tmp129_);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp128_ < _tmp130_)) {
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9203 "ImportPage.c"
+#line 9356 "ImportPage.c"
 				}
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp131_ = folders;
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp132_ = ctr;
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp134_ = gp_list_get_name (_tmp131_, _tmp132_, &_tmp133_);
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp135_ = g_strdup (_tmp133_);
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				subdir = _tmp135_;
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				self->priv->refresh_result = _tmp134_;
-#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp136_ = self->priv->refresh_result;
-#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp136_ != GP_OK) {
-#line 9223 "ImportPage.c"
+#line 9376 "ImportPage.c"
 					gint _tmp137_ = 0;
 					int _tmp138_ = 0;
 					gchar* _tmp139_ = NULL;
 					gchar* _tmp140_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp137_ = ctr;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp138_ = self->priv->refresh_result;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp139_ = gp_result_to_full_string (_tmp138_);
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp140_ = _tmp139_;
-#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"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp137_, _tmp140_);
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp140_);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9252 "ImportPage.c"
+#line 9405 "ImportPage.c"
 				}
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp141_ = fsid;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp142_ = dir;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp143_ = subdir;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp144_ = import_page_append_path (_tmp142_, _tmp143_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp145_ = _tmp144_;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp146_ = import_list;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp147_ = import_page_enumerate_files (self, _tmp141_, _tmp145_, _tmp146_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp148_ = !_tmp147_;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp145_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp148_) {
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9286 "ImportPage.c"
+#line 9439 "ImportPage.c"
 				}
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9290 "ImportPage.c"
+#line 9443 "ImportPage.c"
 			}
 		}
 	}
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 9304 "ImportPage.c"
+#line 9457 "ImportPage.c"
 }
 
 
 static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) {
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9313 "ImportPage.c"
+#line 9466 "ImportPage.c"
 	{
 		gint i = 0;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9318 "ImportPage.c"
+#line 9471 "ImportPage.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp0_ = TRUE;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9325 "ImportPage.c"
+#line 9478 "ImportPage.c"
 				gint _tmp2_ = 0;
 				GeeArrayList* _tmp3_ = NULL;
 				gint _tmp4_ = 0;
@@ -9350,162 +9503,162 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				PhotoImportSource* _tmp29_ = NULL;
 				gboolean _tmp30_ = FALSE;
 				PhotoImportSource* _tmp31_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9351 "ImportPage.c"
+#line 9504 "ImportPage.c"
 					gint _tmp1_ = 0;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp1_ = i;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					i = _tmp1_ + 1;
-#line 9357 "ImportPage.c"
+#line 9510 "ImportPage.c"
 				}
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp2_ = i;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp3_ = import_list;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/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 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp5_ = _tmp4_;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp2_ < _tmp5_)) {
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9373 "ImportPage.c"
+#line 9526 "ImportPage.c"
 				}
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp7_ = i;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/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 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = (ImportSource*) _tmp8_;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp10_ == NULL) {
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp9_);
-#line 9389 "ImportPage.c"
+#line 9542 "ImportPage.c"
 				}
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = i;
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp13_ = import_list;
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/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 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = _tmp14_;
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9403 "ImportPage.c"
+#line 9556 "ImportPage.c"
 					GeeArrayList* _tmp16_ = NULL;
 					gint _tmp17_ = 0;
 					gpointer _tmp18_ = NULL;
 					ImportSource* _tmp19_ = NULL;
 					PhotoImportSource* _tmp20_ = NULL;
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = import_list;
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp17_ = i;
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/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 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp19_ = (ImportSource*) _tmp18_;
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL;
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp20_ == NULL) {
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp19_);
-#line 9423 "ImportPage.c"
+#line 9576 "ImportPage.c"
 					}
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = _tmp20_;
-#line 9429 "ImportPage.c"
+#line 9582 "ImportPage.c"
 				} else {
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = NULL;
-#line 9435 "ImportPage.c"
+#line 9588 "ImportPage.c"
 				}
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				next = _tmp21_;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = i;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp23_ > 0) {
-#line 9445 "ImportPage.c"
+#line 9598 "ImportPage.c"
 					GeeArrayList* _tmp24_ = NULL;
 					gint _tmp25_ = 0;
 					gpointer _tmp26_ = NULL;
 					ImportSource* _tmp27_ = NULL;
 					PhotoImportSource* _tmp28_ = NULL;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = import_list;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = i;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/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 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = (ImportSource*) _tmp26_;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp28_ == NULL) {
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp27_);
-#line 9465 "ImportPage.c"
+#line 9618 "ImportPage.c"
 					}
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = _tmp28_;
-#line 9471 "ImportPage.c"
+#line 9624 "ImportPage.c"
 				} else {
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = NULL;
-#line 9477 "ImportPage.c"
+#line 9630 "ImportPage.c"
 				}
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				prev = _tmp29_;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = current;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_ != NULL) {
-#line 9487 "ImportPage.c"
+#line 9640 "ImportPage.c"
 					PhotoImportSource* _tmp32_ = NULL;
 					PhotoFileFormat _tmp33_ = 0;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = current;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = photo_import_source_get_file_format (_tmp32_);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9496 "ImportPage.c"
+#line 9649 "ImportPage.c"
 				} else {
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9500 "ImportPage.c"
+#line 9653 "ImportPage.c"
 				}
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9504 "ImportPage.c"
+#line 9657 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
 					PhotoImportSource* _tmp34_ = NULL;
@@ -9519,48 +9672,48 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					gboolean _tmp52_ = FALSE;
 					PhotoImportSource* _tmp53_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = current;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = _tmp35_;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					current_name = _tmp37_;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ext = _tmp38_;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp36_);
-#line 1467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					associated = NULL;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = next;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_ != NULL) {
-#line 9542 "ImportPage.c"
+#line 9695 "ImportPage.c"
 						PhotoImportSource* _tmp41_ = NULL;
 						PhotoFileFormat _tmp42_ = 0;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = next;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = photo_import_source_get_file_format (_tmp41_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9551 "ImportPage.c"
+#line 9704 "ImportPage.c"
 					} else {
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9555 "ImportPage.c"
+#line 9708 "ImportPage.c"
 					}
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9559 "ImportPage.c"
+#line 9712 "ImportPage.c"
 						gchar* next_name = NULL;
 						PhotoImportSource* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
@@ -9569,69 +9722,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 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp43_ = next;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp45_ = _tmp44_;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_);
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						next_name = _tmp46_;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp47_;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp45_);
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = next_name;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = current_name;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9592 "ImportPage.c"
+#line 9745 "ImportPage.c"
 							PhotoImportSource* _tmp50_ = NULL;
 							PhotoImportSource* _tmp51_ = NULL;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp50_ = next;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp51_ = _g_object_ref0 (_tmp50_);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp51_;
-#line 9603 "ImportPage.c"
+#line 9756 "ImportPage.c"
 						}
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9607 "ImportPage.c"
+#line 9760 "ImportPage.c"
 					}
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = prev;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp53_ != NULL) {
-#line 9613 "ImportPage.c"
+#line 9766 "ImportPage.c"
 						PhotoImportSource* _tmp54_ = NULL;
 						PhotoFileFormat _tmp55_ = 0;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = prev;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = photo_import_source_get_file_format (_tmp54_);
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9622 "ImportPage.c"
+#line 9775 "ImportPage.c"
 					} else {
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9626 "ImportPage.c"
+#line 9779 "ImportPage.c"
 					}
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9630 "ImportPage.c"
+#line 9783 "ImportPage.c"
 						gchar* prev_name = NULL;
 						PhotoImportSource* _tmp56_ = NULL;
 						gchar* _tmp57_ = NULL;
@@ -9640,52 +9793,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 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = prev;
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp58_ = _tmp57_;
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_);
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						prev_name = _tmp59_;
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp60_;
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp58_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = prev_name;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = current_name;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9663 "ImportPage.c"
+#line 9816 "ImportPage.c"
 							PhotoImportSource* _tmp63_ = NULL;
 							PhotoImportSource* _tmp64_ = NULL;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp63_ = prev;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp64_;
-#line 9674 "ImportPage.c"
+#line 9827 "ImportPage.c"
 						}
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9678 "ImportPage.c"
+#line 9831 "ImportPage.c"
 					}
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp65_ != NULL) {
-#line 9684 "ImportPage.c"
+#line 9837 "ImportPage.c"
 						PhotoImportSource* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						gchar* _tmp68_ = NULL;
@@ -9697,68 +9850,68 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						GeeArrayList* _tmp74_ = NULL;
 						PhotoImportSource* _tmp75_ = NULL;
 						gboolean _tmp76_ = FALSE;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = current;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = _tmp67_;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = associated;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp71_ = _tmp70_;
-#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"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_debug ("ImportPage.vala:1505: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp71_);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp68_);
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = current;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = associated;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						photo_import_source_set_associated (_tmp72_, _tmp73_);
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = import_list;
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp75_ = associated;
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/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 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp76_) {
-#line 9728 "ImportPage.c"
+#line 9881 "ImportPage.c"
 							PhotoImportSource* _tmp77_ = NULL;
-#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"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							g_debug ("ImportPage.vala:1508: Unable to associate files");
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp77_ = current;
-#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9736 "ImportPage.c"
+#line 9889 "ImportPage.c"
 						}
 					}
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 9745 "ImportPage.c"
+#line 9898 "ImportPage.c"
 				}
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp22_);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (next);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (current);
-#line 9757 "ImportPage.c"
+#line 9910 "ImportPage.c"
 			}
 		}
 	}
@@ -9768,13 +9921,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 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_LIST (import_list));
-#line 1495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	loaded_photos = 0;
-#line 9773 "ImportPage.c"
+#line 9926 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
 		GeeList* _tmp0_ = NULL;
@@ -9784,25 +9937,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 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = import_list;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_list = _tmp1_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _import_source_list;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_size = _tmp4_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_index = -1;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 9801 "ImportPage.c"
+#line 9954 "ImportPage.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -9853,143 +10006,143 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			GeeList* _tmp130_ = NULL;
 			gint _tmp131_ = 0;
 			gint _tmp132_ = 0;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = _import_source_index;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_source_index = _tmp5_ + 1;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _import_source_index;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _import_source_size;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp6_ < _tmp7_)) {
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 9864 "ImportPage.c"
+#line 10017 "ImportPage.c"
 			}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = _import_source_index;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_source = (ImportSource*) _tmp10_;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = import_source;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp12_ = import_source_get_filename (_tmp11_);
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			filename = _tmp12_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = import_source;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = import_source_get_fulldir (_tmp13_);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fulldir = _tmp14_;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = fulldir;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp15_ == NULL) {
-#line 9890 "ImportPage.c"
+#line 10043 "ImportPage.c"
 				ImportSource* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = import_source;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = _tmp17_;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_warning ("ImportPage.vala:1500: Skipping loading preview of %s: invalid folder n" \
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_warning ("ImportPage.vala:1522: Skipping loading preview of %s: invalid folder n" \
 "ame", _tmp18_);
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp18_);
-#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 9912 "ImportPage.c"
+#line 10065 "ImportPage.c"
 			}
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = import_source;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 9920 "ImportPage.c"
+#line 10073 "ImportPage.c"
 				ImportSource* _tmp21_ = NULL;
 				PhotoImportSource* _tmp22_ = NULL;
 				PhotoImportSource* _tmp23_ = NULL;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = import_source;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1530 "/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 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = _tmp22_;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = _tmp23_ != NULL;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp23_);
-#line 9934 "ImportPage.c"
+#line 10087 "ImportPage.c"
 			} else {
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 9938 "ImportPage.c"
+#line 10091 "ImportPage.c"
 			}
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 9942 "ImportPage.c"
+#line 10095 "ImportPage.c"
 				ImportSource* _tmp24_ = NULL;
 				PhotoImportSource* _tmp25_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = import_source;
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1531 "/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 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				associated = _tmp25_;
-#line 9953 "ImportPage.c"
+#line 10106 "ImportPage.c"
 			}
-#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
-#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE);
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp27_ = self->priv->progress_bar;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp28_ = _ ("Fetching preview for %s");
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp29_ = import_source;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp31_ = _tmp30_;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = g_strdup_printf (_tmp28_, _tmp31_);
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp33_ = _tmp32_;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_text (_tmp27_, _tmp33_);
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp33_);
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp31_);
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			metadata = NULL;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = filename;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp35_) {
-#line 9987 "ImportPage.c"
+#line 10140 "ImportPage.c"
 				{
 					PhotoMetadata* _tmp36_ = NULL;
 					GPSpinIdleWrapper* _tmp37_ = NULL;
@@ -9999,94 +10152,94 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					const gchar* _tmp41_ = NULL;
 					PhotoMetadata* _tmp42_ = NULL;
 					PhotoMetadata* _tmp43_ = NULL;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = import_page_spin_idle_context;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = self->priv->camera;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = fulldir;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = filename;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp42_ = gp_load_metadata (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_inner_error_);
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = _tmp42_;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10013 "ImportPage.c"
-						goto __catch65_g_error;
+#line 10166 "ImportPage.c"
+						goto __catch67_g_error;
 					}
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = _tmp36_;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = NULL;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					metadata = _tmp43_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (_tmp36_);
-#line 10026 "ImportPage.c"
+#line 10179 "ImportPage.c"
 				}
-				goto __finally65;
-				__catch65_g_error:
+				goto __finally67;
+				__catch67_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
 					const gchar* _tmp45_ = NULL;
 					GError* _tmp46_ = NULL;
 					const gchar* _tmp47_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = fulldir;
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = filename;
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp46_ = err;
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = _tmp46_->message;
-#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"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10052 "ImportPage.c"
+#line 10205 "ImportPage.c"
 				}
-				__finally65:
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally67:
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/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 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10075 "ImportPage.c"
+#line 10228 "ImportPage.c"
 				}
 			}
-#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			exif_only_md5 = NULL;
-#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp48_ = metadata;
-#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp48_ != NULL) {
-#line 10084 "ImportPage.c"
+#line 10237 "ImportPage.c"
 				guint8* flattened_sans_thumbnail = NULL;
 				PhotoMetadata* _tmp49_ = NULL;
 				gint _tmp50_ = 0;
@@ -10096,76 +10249,76 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				gboolean _tmp52_ = FALSE;
 				guint8* _tmp53_ = NULL;
 				gint _tmp53__length1 = 0;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp49_ = metadata;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp51_ = photo_metadata_flatten_exif (_tmp49_, FALSE, &_tmp50_);
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = _tmp51_;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail_length1 = _tmp50_;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp53_ = flattened_sans_thumbnail;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp53__length1 = flattened_sans_thumbnail_length1;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp53_ != NULL) {
-#line 10110 "ImportPage.c"
+#line 10263 "ImportPage.c"
 					guint8* _tmp54_ = NULL;
 					gint _tmp54__length1 = 0;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp54_ = flattened_sans_thumbnail;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp54__length1 = flattened_sans_thumbnail_length1;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp54__length1 > 0;
-#line 10119 "ImportPage.c"
+#line 10272 "ImportPage.c"
 				} else {
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = FALSE;
-#line 10123 "ImportPage.c"
+#line 10276 "ImportPage.c"
 				}
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp52_) {
-#line 10127 "ImportPage.c"
+#line 10280 "ImportPage.c"
 					guint8* _tmp55_ = NULL;
 					gint _tmp55__length1 = 0;
 					guint8* _tmp56_ = NULL;
 					gint _tmp56__length1 = 0;
 					gchar* _tmp57_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = flattened_sans_thumbnail;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56_ = flattened_sans_thumbnail;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56__length1 = flattened_sans_thumbnail_length1;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					exif_only_md5 = _tmp57_;
-#line 10147 "ImportPage.c"
+#line 10300 "ImportPage.c"
 				}
-#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10151 "ImportPage.c"
+#line 10304 "ImportPage.c"
 			}
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw_length1 = 0;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_preview_raw_size_ = preview_raw_length1;
-#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw_length = (gsize) 0;
-#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = NULL;
-#line 10163 "ImportPage.c"
+#line 10316 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
 				const gchar* _tmp58_ = NULL;
@@ -10185,260 +10338,260 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				gsize _tmp75_ = 0UL;
 				GdkPixbuf* _tmp76_ = NULL;
 				GdkPixbuf* _tmp77_ = NULL;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp58_ = fulldir;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp59_ = g_strdup (_tmp58_);
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_fulldir = _tmp59_;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp60_ = filename;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp61_ = g_strdup (_tmp60_);
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_filename = _tmp61_;
-#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp62_ = associated;
-#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp62_ != NULL) {
-#line 10199 "ImportPage.c"
+#line 10352 "ImportPage.c"
 					PhotoImportSource* _tmp63_ = NULL;
 					gchar* _tmp64_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
 					gchar* _tmp66_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = associated;
-#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp64_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_fulldir = _tmp64_;
-#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
-#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp66_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_filename = _tmp66_;
-#line 10220 "ImportPage.c"
+#line 10373 "ImportPage.c"
 				}
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp68_ = import_page_spin_idle_context;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp70_ = self->priv->camera;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp71_ = preview_fulldir;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp72_ = preview_filename;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp76_ = gp_load_preview (_tmp69_, _tmp70_, _tmp71_, _tmp72_, &_tmp73_, &_tmp74_, &_tmp75_, &_inner_error_);
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = (g_free (preview_raw), NULL);
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = _tmp73_;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw_length1 = _tmp74_;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_preview_raw_size_ = preview_raw_length1;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw_length = _tmp75_;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp67_ = _tmp76_;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10252 "ImportPage.c"
-					goto __catch66_g_error;
+#line 10405 "ImportPage.c"
+					goto __catch68_g_error;
 				}
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp77_ = _tmp67_;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp67_ = NULL;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview = _tmp77_;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp67_);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_filename);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10269 "ImportPage.c"
+#line 10422 "ImportPage.c"
 			}
-			goto __finally66;
-			__catch66_g_error:
+			goto __finally68;
+			__catch68_g_error:
 			{
 				GError* err = NULL;
 				const gchar* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp78_ = filename;
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp79_) {
-#line 10287 "ImportPage.c"
+#line 10440 "ImportPage.c"
 					const gchar* _tmp80_ = NULL;
 					const gchar* _tmp81_ = NULL;
 					GError* _tmp82_ = NULL;
 					const gchar* _tmp83_ = NULL;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp80_ = fulldir;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp81_ = filename;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp82_ = err;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp83_ = _tmp82_->message;
-#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 10302 "ImportPage.c"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
+#line 10455 "ImportPage.c"
 				}
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10306 "ImportPage.c"
+#line 10459 "ImportPage.c"
 			}
-			__finally66:
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally68:
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = (g_free (preview_raw), NULL);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (exif_only_md5);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_media_metadata_unref0 (metadata);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_import_source_list);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/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 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 10335 "ImportPage.c"
+#line 10488 "ImportPage.c"
 			}
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_md5 = NULL;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp86_ = preview;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp86_ != NULL) {
-#line 10343 "ImportPage.c"
+#line 10496 "ImportPage.c"
 				guint8* _tmp87_ = NULL;
 				gint _tmp87__length1 = 0;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp87_ = preview_raw;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp87__length1 = preview_raw_length1;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = _tmp87_ != NULL;
-#line 10352 "ImportPage.c"
+#line 10505 "ImportPage.c"
 			} else {
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = FALSE;
-#line 10356 "ImportPage.c"
+#line 10509 "ImportPage.c"
 			}
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp85_) {
-#line 10360 "ImportPage.c"
+#line 10513 "ImportPage.c"
 				gsize _tmp88_ = 0UL;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp88_ = preview_raw_length;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10366 "ImportPage.c"
+#line 10519 "ImportPage.c"
 			} else {
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = FALSE;
-#line 10370 "ImportPage.c"
+#line 10523 "ImportPage.c"
 			}
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp84_) {
-#line 10374 "ImportPage.c"
+#line 10527 "ImportPage.c"
 				guint8* _tmp89_ = NULL;
 				gint _tmp89__length1 = 0;
 				gsize _tmp90_ = 0UL;
 				gchar* _tmp91_ = NULL;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp89_ = preview_raw;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp89__length1 = preview_raw_length1;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp90_ = preview_raw_length;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp91_ = md5_binary (_tmp89_, _tmp90_);
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_md5);
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_md5 = _tmp91_;
-#line 10391 "ImportPage.c"
+#line 10544 "ImportPage.c"
 			}
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp92_ = import_source;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10397 "ImportPage.c"
+#line 10550 "ImportPage.c"
 				ImportSource* _tmp93_ = NULL;
 				GdkPixbuf* _tmp94_ = NULL;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp93_ = import_source;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp94_ = preview;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1600 "/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 10406 "ImportPage.c"
+#line 10559 "ImportPage.c"
 			}
-#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp95_ = import_source;
-#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10412 "ImportPage.c"
+#line 10565 "ImportPage.c"
 				ImportSource* _tmp96_ = NULL;
 				GdkPixbuf* _tmp97_ = NULL;
 				const gchar* _tmp98_ = NULL;
 				PhotoMetadata* _tmp99_ = NULL;
 				const gchar* _tmp100_ = NULL;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp96_ = import_source;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp97_ = preview;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp98_ = preview_md5;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp99_ = metadata;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp100_ = exif_only_md5;
-#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1603 "/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 10430 "ImportPage.c"
+#line 10583 "ImportPage.c"
 			}
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp101_ = associated;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp101_ != NULL) {
-#line 10436 "ImportPage.c"
+#line 10589 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
 					GPSpinIdleWrapper* _tmp102_ = NULL;
@@ -10456,55 +10609,55 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					GdkPixbuf* _tmp114_ = NULL;
 					const gchar* _tmp115_ = NULL;
 					PhotoMetadata* _tmp116_ = NULL;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = import_page_spin_idle_context;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp103_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp104_ = self->priv->camera;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp105_ = associated;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp106_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp107_ = _tmp106_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp108_ = associated;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp109_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp110_ = _tmp109_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp111_ = gp_load_metadata (_tmp103_, _tmp104_, _tmp107_, _tmp110_, &_inner_error_);
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp112_ = _tmp111_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp110_);
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp107_);
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					associated_metadata = _tmp112_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10484 "ImportPage.c"
-						goto __catch67_g_error;
+#line 10637 "ImportPage.c"
+						goto __catch69_g_error;
 					}
-#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp113_ = associated;
-#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp114_ = preview;
-#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp115_ = preview_md5;
-#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp116_ = associated_metadata;
-#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10499 "ImportPage.c"
+#line 10652 "ImportPage.c"
 				}
-				goto __finally67;
-				__catch67_g_error:
+				goto __finally69;
+				__catch69_g_error:
 				{
 					GError* err = NULL;
 					PhotoImportSource* _tmp117_ = NULL;
@@ -10515,115 +10668,115 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					gchar* _tmp122_ = NULL;
 					GError* _tmp123_ = NULL;
 					const gchar* _tmp124_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp117_ = associated;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp118_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp119_ = _tmp118_;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp120_ = associated;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp121_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp122_ = _tmp121_;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp123_ = err;
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp124_ = _tmp123_->message;
-#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"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_);
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp122_);
-#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp119_);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10541 "ImportPage.c"
+#line 10694 "ImportPage.c"
 				}
-				__finally67:
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally69:
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_md5);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (preview);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_raw = (g_free (preview_raw), NULL);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/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 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10572 "ImportPage.c"
+#line 10725 "ImportPage.c"
 				}
 			}
-#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp125_ = self->priv->import_sources;
-#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp126_ = import_source;
-#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1618 "/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 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp127_ = self->priv->progress_bar;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp128_ = loaded_photos;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			loaded_photos = _tmp128_ + 1;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp129_ = loaded_photos;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp130_ = import_list;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp132_ = _tmp131_;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_fraction (_tmp127_, ((gdouble) _tmp129_) / ((gdouble) _tmp132_));
-#line 1605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			spin_event_loop ();
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (preview_md5);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = (g_free (preview_raw), NULL);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (exif_only_md5);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (metadata);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (associated);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (fulldir);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (filename);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_source);
-#line 10617 "ImportPage.c"
+#line 10770 "ImportPage.c"
 		}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10621 "ImportPage.c"
+#line 10774 "ImportPage.c"
 	}
 }
 
@@ -10635,58 +10788,58 @@ static void import_page_on_hide_imported (ImportPage* self) {
 	ConfigFacade* _tmp9_ = NULL;
 	GtkCheckButton* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 1609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1632 "/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 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 10641 "ImportPage.c"
+#line 10794 "ImportPage.c"
 		ViewCollection* _tmp2_ = NULL;
 		ViewCollection* _tmp3_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp4_ = NULL;
-#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->hide_imported_filter;
-#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1633 "/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 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 10655 "ImportPage.c"
+#line 10808 "ImportPage.c"
 	} else {
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp7_ = NULL;
-#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->hide_imported_filter;
-#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1635 "/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 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 10670 "ImportPage.c"
+#line 10823 "ImportPage.c"
 	}
-#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = self->priv->hide_imported;
-#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/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 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/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 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 10684 "ImportPage.c"
+#line 10837 "ImportPage.c"
 }
 
 
@@ -10695,23 +10848,23 @@ static void import_page_on_import_selected (ImportPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10709 "ImportPage.c"
+#line 10862 "ImportPage.c"
 }
 
 
@@ -10720,53 +10873,53 @@ static void import_page_on_import_all (ImportPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeCollection* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10734 "ImportPage.c"
+#line 10887 "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 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 10743 "ImportPage.c"
+#line 10896 "ImportPage.c"
 }
 
 
 static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10750 "ImportPage.c"
+#line 10903 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
-#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10757 "ImportPage.c"
+#line 10910 "ImportPage.c"
 }
 
 
 static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_close_import ((ImportPage*) self);
-#line 10764 "ImportPage.c"
+#line 10917 "ImportPage.c"
 }
 
 
@@ -10790,85 +10943,85 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	SortedList* _tmp59_ = NULL;
 	gint _tmp60_ = 0;
 	gint _tmp61_ = 0;
-#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (items));
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_init (_tmp0_, _tmp2_);
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 10806 "ImportPage.c"
+#line 10959 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		int _tmp6_ = 0;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _ ("Unable to lock camera: %s");
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = res;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = gp_result_to_full_string (_tmp6_);
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp8_);
-#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 10833 "ImportPage.c"
+#line 10986 "ImportPage.c"
 	}
-#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = self->priv->refreshed;
-#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, _tmp11_);
-#line 1636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = self->priv->progress_bar;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/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 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/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 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	jobs = _tmp13_;
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1662 "/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 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	already_imported = _tmp14_;
-#line 10853 "ImportPage.c"
+#line 11006 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp15_ = NULL;
 		GeeIterator* _tmp16_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = items;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = gee_iterable_iterator (_tmp15_);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_object_it = _tmp16_;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 10866 "ImportPage.c"
+#line 11019 "ImportPage.c"
 			GeeIterator* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			DataObject* object = NULL;
@@ -10890,41 +11043,41 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			ImportSource* _tmp42_ = NULL;
 			SortedList* _tmp53_ = NULL;
 			ImportPageCameraImportJob* _tmp54_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = _object_it;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = gee_iterator_next (_tmp17_);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp18_) {
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 10896 "ImportPage.c"
+#line 11049 "ImportPage.c"
 			}
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = _object_it;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = gee_iterator_get (_tmp19_);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			object = (DataObject*) _tmp20_;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = object;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = _tmp22_;
-#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = preview;
-#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_VIEW, DataView));
-#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = preview;
-#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = import_preview_is_already_imported (_tmp25_);
-#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp26_) {
-#line 10922 "ImportPage.c"
+#line 11075 "ImportPage.c"
 				ImportSource* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
@@ -10936,84 +11089,84 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				DuplicatedFile* _tmp35_ = NULL;
 				ImportPageCameraImportJob* _tmp36_ = NULL;
 				ImportPageCameraImportJob* _tmp37_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = import_file;
-#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = import_source_get_filename (_tmp27_);
-#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _tmp28_;
-#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_message ("ImportPage.vala:1647: Skipping import of %s: checksum detected in libr" \
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \
 "ary", _tmp29_);
-#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp29_);
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = already_imported;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = import_page_null_context;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = import_file;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = preview;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = import_preview_get_duplicated_file (_tmp33_);
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp35_ = _tmp34_;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp36_ = import_page_camera_import_job_new (_tmp31_, _tmp32_, _tmp35_);
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp37_ = _tmp36_;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/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 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp37_);
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp35_);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_file);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (object);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 10974 "ImportPage.c"
+#line 11127 "ImportPage.c"
 			}
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = import_page_null_context;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp39_ = import_file;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp40_ = import_page_camera_import_job_new (_tmp38_, _tmp39_, NULL);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_job = _tmp40_;
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp42_ = import_file;
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10988 "ImportPage.c"
+#line 11141 "ImportPage.c"
 				ImportSource* _tmp43_ = NULL;
 				PhotoImportSource* _tmp44_ = NULL;
 				PhotoImportSource* _tmp45_ = NULL;
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp43_ = import_file;
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/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 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp45_ = _tmp44_;
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = _tmp45_ != NULL;
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp45_);
-#line 11002 "ImportPage.c"
+#line 11155 "ImportPage.c"
 			} else {
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = FALSE;
-#line 11006 "ImportPage.c"
+#line 11159 "ImportPage.c"
 			}
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp41_) {
-#line 11010 "ImportPage.c"
+#line 11163 "ImportPage.c"
 				ImportPageCameraImportJob* _tmp46_ = NULL;
 				GPContextWrapper* _tmp47_ = NULL;
 				ImportSource* _tmp48_ = NULL;
@@ -11021,67 +11174,67 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				PhotoImportSource* _tmp50_ = NULL;
 				ImportPageCameraImportJob* _tmp51_ = NULL;
 				ImportPageCameraImportJob* _tmp52_ = NULL;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp46_ = import_job;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp47_ = import_page_null_context;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp48_ = import_file;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/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 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp50_ = _tmp49_;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/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 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp52_ = _tmp51_;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/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 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp52_);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp50_);
-#line 11038 "ImportPage.c"
+#line 11191 "ImportPage.c"
 			}
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = jobs;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp54_ = import_job;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (import_job);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_file);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (object);
-#line 11054 "ImportPage.c"
+#line 11207 "ImportPage.c"
 		}
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11058 "ImportPage.c"
+#line 11211 "ImportPage.c"
 	}
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = jobs;
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp57_ = _tmp56_;
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp58_ = self->priv->camera_name;
-#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"
+#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp57_, _tmp58_);
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = jobs;
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp61_ = _tmp60_;
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp61_ > 0) {
-#line 11078 "ImportPage.c"
+#line 11231 "ImportPage.c"
 		ImportPage* _tmp62_ = NULL;
 		ImportPage* _tmp63_ = NULL;
 		BatchImport* batch_import = NULL;
@@ -11096,92 +11249,92 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		BatchImport* _tmp72_ = NULL;
 		LibraryWindow* _tmp73_ = NULL;
 		LibraryWindow* _tmp74_ = NULL;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = self->priv->local_ref;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_vala_assert (_tmp62_ == NULL, "local_ref == null");
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp63_ = _g_object_ref0 (self);
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->local_ref);
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->local_ref = _tmp63_;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp64_ = jobs;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp65_ = self->priv->camera_name;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp66_ = already_imported;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/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 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		batch_import = _tmp67_;
-#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp68_ = batch_import;
-#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1699 "/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 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp69_ = batch_import;
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/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 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp70_ = library_window_get_app ();
-#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp71_ = _tmp70_;
-#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp72_ = batch_import;
-#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_enqueue_batch_import (_tmp71_, _tmp72_, TRUE);
-#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp71_);
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp73_ = library_window_get_app ();
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp74_ = _tmp73_;
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_switch_to_import_queue_page (_tmp74_);
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp74_);
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11141 "ImportPage.c"
+#line 11294 "ImportPage.c"
 	} else {
 		GeeArrayList* _tmp75_ = NULL;
 		gint _tmp76_ = 0;
 		gint _tmp77_ = 0;
-#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp75_ = already_imported;
-#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/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 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp77_ = _tmp76_;
-#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp77_ > 0) {
-#line 11154 "ImportPage.c"
+#line 11307 "ImportPage.c"
 			GeeArrayList* _tmp78_ = NULL;
 			ImportManifest* _tmp79_ = NULL;
 			ImportManifest* _tmp80_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp78_ = already_imported;
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp79_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp80_ = _tmp79_;
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_page_import_reporter (self, _tmp80_);
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_manifest_unref0 (_tmp80_);
-#line 11168 "ImportPage.c"
+#line 11321 "ImportPage.c"
 		}
-#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11172 "ImportPage.c"
+#line 11325 "ImportPage.c"
 	}
-#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (already_imported);
-#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (jobs);
-#line 11178 "ImportPage.c"
+#line 11331 "ImportPage.c"
 }
 
 
@@ -11190,53 +11343,53 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 	BatchImportResult* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_));
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _result_;
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->file;
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ == NULL) {
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 11199 "ImportPage.c"
+#line 11352 "ImportPage.c"
 	} else {
 		BatchImportResult* _tmp3_ = NULL;
 		ImportResult _tmp4_ = 0;
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _result_;
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_->result;
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11209 "ImportPage.c"
+#line 11362 "ImportPage.c"
 	}
-#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11215 "ImportPage.c"
+#line 11368 "ImportPage.c"
 	}
 	{
 		BatchImportResult* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
-#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _result_;
-#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_->file;
-#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_file_delete (_tmp6_, NULL, &_inner_error_);
-#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11228 "ImportPage.c"
-			goto __catch68_g_error;
+#line 11381 "ImportPage.c"
+			goto __catch70_g_error;
 		}
 	}
-	goto __finally68;
-	__catch68_g_error:
+	goto __finally70;
+	__catch70_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_ = NULL;
@@ -11245,57 +11398,57 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _result_;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp7_->file;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = err;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_->message;
-#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"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1722: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 11264 "ImportPage.c"
+#line 11417 "ImportPage.c"
 	}
-	__finally68:
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally70:
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/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 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11275 "ImportPage.c"
+#line 11428 "ImportPage.c"
 	}
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 11283 "ImportPage.c"
+#line 11436 "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 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11292 "ImportPage.c"
+#line 11445 "ImportPage.c"
 }
 
 
@@ -11325,31 +11478,31 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	gint _tmp91_ = 0;
 	gint _tmp92_ = 0;
 	ProgressDialog* _tmp98_ = NULL;
-#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->local_ref;
-#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = _tmp1_;
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->local_ref);
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->local_ref = NULL;
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = manifest;
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_->success;
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ > 0) {
-#line 11346 "ImportPage.c"
+#line 11499 "ImportPage.c"
 		gchar* photos_string = NULL;
 		ImportManifest* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
@@ -11409,176 +11562,176 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		ImportManifest* _tmp56_ = NULL;
 		ImportUIQuestionParams* _tmp57_ = NULL;
 		gboolean _tmp58_ = FALSE;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = manifest;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_->success;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_);
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = manifest;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_->success;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = g_strdup_printf (_tmp10_, _tmp14_);
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		photos_string = _tmp15_;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = manifest;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = _tmp16_->success;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp19_);
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = manifest;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = _tmp21_->success;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = _tmp23_;
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = g_strdup_printf (_tmp20_, _tmp24_);
-#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		videos_string = _tmp25_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = manifest;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = _tmp26_->success;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = _tmp28_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/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 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = manifest;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = _tmp31_->success;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp34_ = _tmp33_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp35_ = g_strdup_printf (_tmp30_, _tmp34_);
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		both_string = _tmp35_;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp36_ = manifest;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp37_ = _tmp36_->success;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = _tmp38_;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp40_ = ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp39_);
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp41_ = manifest;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = _tmp41_->success;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp44_ = _tmp43_;
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = g_strdup_printf (_tmp40_, _tmp44_);
-#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		neither_string = _tmp45_;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp46_ = manifest;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp47_ = _tmp46_->success;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp48_ = photos_string;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp49_ = videos_string;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp50_ = both_string;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp51_ = neither_string;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/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 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question_string = _tmp52_;
-#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp53_ = question_string;
-#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp54_ = _ ("_Keep");
-#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp55_ = import_ui_question_params_new (_tmp53_, RESOURCES_DELETE_LABEL, _tmp54_);
-#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question = _tmp55_;
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp56_ = manifest;
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp57_ = question;
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp58_ = import_ui_report_manifest (_tmp56_, FALSE, _tmp57_);
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp58_) {
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_ui_question_params_unref0 (question);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (question_string);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (neither_string);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (both_string);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (videos_string);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (photos_string);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (local_ref);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return;
-#line 11542 "ImportPage.c"
+#line 11695 "ImportPage.c"
 		}
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (question_string);
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (neither_string);
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (both_string);
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (videos_string);
-#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (photos_string);
-#line 11556 "ImportPage.c"
+#line 11709 "ImportPage.c"
 	} else {
 		ImportManifest* _tmp59_ = NULL;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp59_ = manifest;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_ui_report_manifest (_tmp59_, FALSE, NULL);
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (local_ref);
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11567 "ImportPage.c"
+#line 11720 "ImportPage.c"
 	}
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = self->priv->import_sources;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp61_;
-#line 11575 "ImportPage.c"
+#line 11728 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
 		ImportManifest* _tmp62_ = NULL;
@@ -11589,27 +11742,27 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		gint _tmp66_ = 0;
 		gint _tmp67_ = 0;
 		gint _batch_result_index = 0;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = manifest;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp63_ = _tmp62_->success;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_list = _tmp64_;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp65_ = _batch_result_list;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp66_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp67_ = _tmp66_;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_size = _tmp67_;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_index = -1;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11606 "ImportPage.c"
+#line 11759 "ImportPage.c"
 			gint _tmp68_ = 0;
 			gint _tmp69_ = 0;
 			gint _tmp70_ = 0;
@@ -11625,134 +11778,134 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			ImportPageCameraImportJob* _tmp78_ = NULL;
 			ImportSource* _tmp79_ = NULL;
 			ImportSource* _tmp80_ = NULL;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp68_ = _batch_result_index;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_result_index = _tmp68_ + 1;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp69_ = _batch_result_index;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp70_ = _batch_result_size;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp69_ < _tmp70_)) {
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11634 "ImportPage.c"
+#line 11787 "ImportPage.c"
 			}
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp71_ = _batch_result_list;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp72_ = _batch_result_index;
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp73_ = gee_list_get (_tmp71_, _tmp72_);
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			batch_result = (BatchImportResult*) _tmp73_;
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp74_ = batch_result;
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp75_ = _tmp74_->job;
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/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 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			job = _tmp76_;
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp77_ = marker;
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp78_ = job;
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp79_ = import_page_camera_import_job_get_source (_tmp78_);
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp80_ = _tmp79_;
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			marker_mark (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject));
-#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp80_);
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (job);
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11668 "ImportPage.c"
+#line 11821 "ImportPage.c"
 		}
-#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11672 "ImportPage.c"
+#line 11825 "ImportPage.c"
 	}
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = app_window_get_instance ();
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp82_ = _tmp81_;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp83_ = _ ("Removing photos/videos from camera");
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp84_ = g_cancellable_new ();
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp85_ = _tmp84_;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/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 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp86_);
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp87_ = _tmp86_;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp85_);
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp82_);
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress = _tmp87_;
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp88_ = self->priv->import_sources;
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = marker;
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp90_ = progress;
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp91_ = source_collection_destroy_marked (_tmp88_, _tmp89_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp90_, NULL);
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	error_count = _tmp91_;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp92_ = error_count;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp92_ > 0) {
-#line 11710 "ImportPage.c"
+#line 11863 "ImportPage.c"
 		gchar* error_string = NULL;
 		gint _tmp93_ = 0;
 		const gchar* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
 		gchar* _tmp96_ = NULL;
 		const gchar* _tmp97_ = NULL;
-#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp93_ = error_count;
-#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/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 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp95_ = error_count;
-#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp96_ = g_strdup_printf (_tmp94_, _tmp95_);
-#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		error_string = _tmp96_;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp97_ = error_string;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp97_, NULL);
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11733 "ImportPage.c"
+#line 11886 "ImportPage.c"
 	}
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp98_ = progress;
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress_dialog_close (_tmp98_);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = NULL;
-#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (progress);
-#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 11749 "ImportPage.c"
+#line 11902 "ImportPage.c"
 }
 
 
@@ -11764,45 +11917,45 @@ static void import_page_close_import (ImportPage* self) {
 	int _tmp3_ = 0;
 	int _tmp4_ = 0;
 	gboolean _tmp8_ = FALSE;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_exit (_tmp0_, _tmp2_);
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11777 "ImportPage.c"
+#line 11930 "ImportPage.c"
 		int _tmp5_ = 0;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = res;
-#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#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"
+#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1792: Unable to unlock camera: %s", _tmp7_);
+#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 11791 "ImportPage.c"
+#line 11944 "ImportPage.c"
 	}
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp8_);
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 11799 "ImportPage.c"
+#line 11952 "ImportPage.c"
 }
 
 
@@ -11810,24 +11963,24 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
 	ImportPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = display;
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1801 "/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 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = display;
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11817 "ImportPage.c"
+#line 11970 "ImportPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 11824 "ImportPage.c"
+#line 11977 "ImportPage.c"
 }
 
 
@@ -11836,17 +11989,17 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
 	SearchViewFilter* result = NULL;
 	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11843 "ImportPage.c"
+#line 11996 "ImportPage.c"
 }
 
 
@@ -11854,28 +12007,28 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
 	ImportPageImportViewManager* self = NULL;
 	ImportPage* _tmp0_ = NULL;
 	ImportPage* _tmp1_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (owner), NULL);
-#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageImportViewManager*) view_manager_construct (object_type);
-#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = owner;
-#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->owner);
-#line 464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->owner = _tmp1_;
-#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 11865 "ImportPage.c"
+#line 12018 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
-#line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner);
-#line 11872 "ImportPage.c"
+#line 12025 "ImportPage.c"
 }
 
 
@@ -11884,51 +12037,51 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	ImportPreview* _tmp1_ = NULL;
-#line 467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
-#line 467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = source;
-#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11893 "ImportPage.c"
+#line 12046 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass) {
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewManagerClass *) klass)->finalize = import_page_import_view_manager_finalize;
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view;
-#line 11906 "ImportPage.c"
+#line 12059 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 11913 "ImportPage.c"
+#line 12066 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_finalize (ViewManager* obj) {
 	ImportPageImportViewManager * self;
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
-#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->owner);
-#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 11925 "ImportPage.c"
+#line 12078 "ImportPage.c"
 }
 
 
@@ -11945,9 +12098,9 @@ 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"
+#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? gp_context_wrapper_ref (self) : NULL;
-#line 11944 "ImportPage.c"
+#line 12097 "ImportPage.c"
 }
 
 
@@ -11973,134 +12126,134 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	PhotoMetadata* _tmp19_ = NULL;
 	ImportSource* _tmp20_ = NULL;
 	time_t _tmp21_ = 0;
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (context), NULL);
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_SOURCE (import_file), NULL);
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail ((duplicated_file == NULL) || IS_DUPLICATED_FILE (duplicated_file), NULL);
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageCameraImportJob*) batch_import_job_construct (object_type);
-#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = context;
-#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _gp_context_wrapper_ref0 (_tmp0_);
-#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_context_wrapper_unref0 (self->priv->context);
-#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->context = _tmp1_;
-#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = import_file;
-#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->import_file);
-#line 488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->import_file = _tmp3_;
-#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = duplicated_file;
-#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->duplicated_file);
-#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->duplicated_file = _tmp5_;
-#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = import_file;
-#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = import_source_get_camera (_tmp6_);
-#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->camera = _tmp7_;
-#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = import_file;
-#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = import_source_get_fulldir (_tmp8_);
-#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->fulldir);
-#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->fulldir = _tmp9_;
-#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = self->priv->fulldir;
-#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_assert (_tmp10_ != NULL, "fulldir != null");
-#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = import_file;
-#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = import_source_get_filename (_tmp11_);
-#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->filename);
-#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->filename = _tmp12_;
-#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = import_file;
-#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = import_source_get_filesize (_tmp13_);
-#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->filesize = (guint64) _tmp14_;
-#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = import_file;
-#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12040 "ImportPage.c"
+#line 12193 "ImportPage.c"
 		ImportSource* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = import_file;
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp17_) : NULL);
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp18_;
-#line 12051 "ImportPage.c"
+#line 12204 "ImportPage.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
-#line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = NULL;
-#line 12057 "ImportPage.c"
+#line 12210 "ImportPage.c"
 	}
-#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
-#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_media_metadata_unref0 (self->priv->metadata);
-#line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->metadata = _tmp19_;
-#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp20_ = import_file;
-#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp21_ = import_source_get_exposure_time (_tmp20_);
-#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->exposure_time = _tmp21_;
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_media_metadata_unref0 (_tmp15_);
-#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12075 "ImportPage.c"
+#line 12228 "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"
+#line 493 "/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 12082 "ImportPage.c"
+#line 12235 "ImportPage.c"
 }
 
 
 static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) {
 	time_t result = 0;
 	time_t _tmp0_ = 0;
-#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), 0);
-#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->exposure_time;
-#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12097 "ImportPage.c"
+#line 12250 "ImportPage.c"
 }
 
 
@@ -12109,17 +12262,17 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
 	DuplicatedFile* result = NULL;
 	DuplicatedFile* _tmp0_ = NULL;
 	DuplicatedFile* _tmp1_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->duplicated_file;
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12116 "ImportPage.c"
+#line 12269 "ImportPage.c"
 }
 
 
@@ -12128,29 +12281,29 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	time_t result = 0;
 	time_t _tmp0_ = 0;
 	ImportSource* _tmp1_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->import_file;
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12131 "ImportPage.c"
+#line 12284 "ImportPage.c"
 		time_t _tmp2_ = 0;
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/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"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 12137 "ImportPage.c"
+#line 12290 "ImportPage.c"
 	} else {
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12141 "ImportPage.c"
+#line 12294 "ImportPage.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12147 "ImportPage.c"
+#line 12300 "ImportPage.c"
 }
 
 
@@ -12159,17 +12312,17 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->filename;
-#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12166 "ImportPage.c"
+#line 12319 "ImportPage.c"
 }
 
 
@@ -12178,17 +12331,17 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
 	gchar* result = NULL;
 	ImportSource* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->import_file;
-#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_source_get_filename (_tmp0_);
-#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12185 "ImportPage.c"
+#line 12338 "ImportPage.c"
 }
 
 
@@ -12197,17 +12350,17 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->filename;
-#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12204 "ImportPage.c"
+#line 12357 "ImportPage.c"
 }
 
 
@@ -12216,17 +12369,17 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->fulldir;
-#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12223 "ImportPage.c"
+#line 12376 "ImportPage.c"
 }
 
 
@@ -12234,19 +12387,19 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
 	ImportPageCameraImportJob * self;
 	BatchImportJob* _tmp0_ = NULL;
 	ImportPageCameraImportJob* _tmp1_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
-#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = associated;
-#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp0_) : NULL);
-#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_batch_import_job_unref0 (self->priv->associated);
-#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 12243 "ImportPage.c"
+#line 12396 "ImportPage.c"
 }
 
 
@@ -12254,30 +12407,30 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
 	ImportSource* result = NULL;
 	ImportSource* _tmp0_ = NULL;
 	ImportSource* _tmp1_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), NULL);
-#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->import_file;
-#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12261 "ImportPage.c"
+#line 12414 "ImportPage.c"
 }
 
 
 static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
 	gboolean result = FALSE;
-#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12274 "ImportPage.c"
+#line 12427 "ImportPage.c"
 }
 
 
@@ -12287,37 +12440,37 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
 	GFile* _vala_file = NULL;
 	gboolean result = FALSE;
 	guint64 _tmp0_ = 0ULL;
-#line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_vala_file);
-#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_file = NULL;
-#line 545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->filesize;
-#line 545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_filesize = _tmp0_;
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (filesize) {
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*filesize = _vala_filesize;
-#line 12300 "ImportPage.c"
+#line 12453 "ImportPage.c"
 	}
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file) {
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file = _vala_file;
-#line 12306 "ImportPage.c"
+#line 12459 "ImportPage.c"
 	} else {
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12310 "ImportPage.c"
+#line 12463 "ImportPage.c"
 	}
-#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12314 "ImportPage.c"
+#line 12467 "ImportPage.c"
 }
 
 
@@ -12333,17 +12486,17 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	GFile* _tmp55_ = NULL;
 	GFile* _tmp56_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_vala_file_to_import);
-#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_file_to_import = NULL;
-#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_copy_to_library = FALSE;
-#line 554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	dest_file = NULL;
-#line 12340 "ImportPage.c"
+#line 12493 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
@@ -12353,37 +12506,37 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gboolean _tmp4_ = FALSE;
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->filename;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->metadata;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->exposure_time;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = library_files_generate_unique_file (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp3_, &_tmp4_, &_inner_error_);
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		collision = _tmp4_;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp5_;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12364 "ImportPage.c"
-			goto __catch69_g_error;
+#line 12517 "ImportPage.c"
+			goto __catch71_g_error;
 		}
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
-#line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		dest_file = _tmp6_;
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 12377 "ImportPage.c"
+#line 12530 "ImportPage.c"
 	}
-	goto __finally69;
-	__catch69_g_error:
+	goto __finally71;
+	__catch71_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -12391,86 +12544,86 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gchar* _tmp9_ = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->import_file;
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = import_source_get_filename (_tmp7_);
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = err;
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = _tmp10_->message;
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:560: Unable to generate local file for %s: %s", _tmp9_, _tmp11_);
-#line 560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:568: Unable to generate local file for %s: %s", _tmp9_, _tmp11_);
+#line 568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp9_);
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 12408 "ImportPage.c"
+#line 12561 "ImportPage.c"
 	}
-	__finally69:
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally71:
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
-#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12419 "ImportPage.c"
+#line 12572 "ImportPage.c"
 	}
-#line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = dest_file;
-#line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp12_ == NULL) {
-#line 12425 "ImportPage.c"
+#line 12578 "ImportPage.c"
 		ImportSource* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = self->priv->import_file;
-#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = import_source_get_filename (_tmp13_);
-#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp14_;
-#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_message ("ImportPage.vala:565: Unable to generate local file for %s", _tmp15_);
-#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp15_);
+#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp15_);
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (file_to_import) {
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*file_to_import = _vala_file_to_import;
-#line 12447 "ImportPage.c"
+#line 12600 "ImportPage.c"
 		} else {
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12451 "ImportPage.c"
+#line 12604 "ImportPage.c"
 		}
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (copy_to_library) {
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 12457 "ImportPage.c"
+#line 12610 "ImportPage.c"
 		}
-#line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12461 "ImportPage.c"
+#line 12614 "ImportPage.c"
 	}
-#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = dest_file;
-#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare");
-#line 12467 "ImportPage.c"
+#line 12620 "ImportPage.c"
 	{
 		GPContextWrapper* _tmp17_ = NULL;
 		GPContext* _tmp18_ = NULL;
@@ -12478,50 +12631,50 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		const gchar* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = self->priv->context;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = _tmp17_->context;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = self->priv->camera;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = self->priv->fulldir;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = self->priv->filename;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = dest_file;
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_);
-#line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12491 "ImportPage.c"
-			goto __finally70;
+#line 12644 "ImportPage.c"
+			goto __finally72;
 		}
 	}
-	__finally70:
+	__finally72:
 	{
 		GFile* _tmp23_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = dest_file;
-#line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 12502 "ImportPage.c"
+#line 12655 "ImportPage.c"
 	}
-#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
-#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
-#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12512 "ImportPage.c"
+#line 12665 "ImportPage.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp24_ = self->priv->associated;
-#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp24_ != NULL) {
-#line 12518 "ImportPage.c"
+#line 12671 "ImportPage.c"
 		BackingPhotoRow* _tmp39_ = NULL;
 		GFile* assoc_dest = NULL;
 		BackingPhotoRow* _tmp42_ = NULL;
@@ -12539,133 +12692,133 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			BackingPhotoRow* _tmp32_ = NULL;
 			BackingPhotoRow* _tmp33_ = NULL;
 			BackingPhotoRow* _tmp34_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = dest_file;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp27_ = g_file_get_path (_tmp26_);
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp28_ = _tmp27_;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp29_ = self->priv->associated;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp30_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp31_ = _tmp30_;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp28_, _tmp31_, &_inner_error_);
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp33_ = _tmp32_;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp31_);
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp28_);
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = _tmp33_;
-#line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12560 "ImportPage.c"
-				goto __catch71_g_error;
+#line 12713 "ImportPage.c"
+				goto __catch73_g_error;
 			}
-#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = _tmp25_;
-#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (self->priv->associated_file);
-#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			self->priv->associated_file = _tmp34_;
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (_tmp25_);
-#line 12573 "ImportPage.c"
+#line 12726 "ImportPage.c"
 		}
-		goto __finally71;
-		__catch71_g_error:
+		goto __finally73;
+		__catch73_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp35_ = NULL;
 			const gchar* _tmp36_ = NULL;
 			GError* _tmp37_ = NULL;
 			const gchar* _tmp38_ = NULL;
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			err = _inner_error_;
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_inner_error_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp35_ = self->priv->associated;
-#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp36_ = _tmp35_->priv->filename;
-#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp37_ = err;
-#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = _tmp37_->message;
-#line 586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_warning ("ImportPage.vala:586: Unable to generate backing associated file for %s" \
+#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_warning ("ImportPage.vala:594: Unable to generate backing associated file for %s" \
 ": %s", _tmp36_, _tmp38_);
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12599 "ImportPage.c"
+#line 12752 "ImportPage.c"
 		}
-		__finally71:
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		__finally73:
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (dest_file);
-#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12610 "ImportPage.c"
+#line 12763 "ImportPage.c"
 		}
-#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = self->priv->associated_file;
-#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp39_ == NULL) {
-#line 12616 "ImportPage.c"
+#line 12769 "ImportPage.c"
 			ImportPageCameraImportJob* _tmp40_ = NULL;
 			const gchar* _tmp41_ = NULL;
-#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp40_ = self->priv->associated;
-#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp41_ = _tmp40_->priv->filename;
-#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_message ("ImportPage.vala:591: Unable to generate backing associated file for %s", _tmp41_);
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp41_);
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = FALSE;
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (dest_file);
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (file_to_import) {
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*file_to_import = _vala_file_to_import;
-#line 12633 "ImportPage.c"
+#line 12786 "ImportPage.c"
 			} else {
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12637 "ImportPage.c"
+#line 12790 "ImportPage.c"
 			}
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (copy_to_library) {
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 12643 "ImportPage.c"
+#line 12796 "ImportPage.c"
 			}
-#line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12647 "ImportPage.c"
+#line 12800 "ImportPage.c"
 		}
-#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = self->priv->associated_file;
-#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = _tmp42_->filepath;
-#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp44_ = g_file_new_for_path (_tmp43_);
-#line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		assoc_dest = _tmp44_;
-#line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = assoc_dest;
-#line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare");
-#line 12661 "ImportPage.c"
+#line 12814 "ImportPage.c"
 		{
 			GPContextWrapper* _tmp46_ = NULL;
 			GPContext* _tmp47_ = NULL;
@@ -12675,88 +12828,88 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			ImportPageCameraImportJob* _tmp51_ = NULL;
 			const gchar* _tmp52_ = NULL;
 			GFile* _tmp53_ = NULL;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp46_ = self->priv->context;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp47_ = _tmp46_->context;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp48_ = self->priv->camera;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp49_ = self->priv->associated;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp50_ = _tmp49_->priv->fulldir;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp51_ = self->priv->associated;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp52_ = _tmp51_->priv->filename;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = assoc_dest;
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_);
-#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12691 "ImportPage.c"
-				goto __finally72;
+#line 12844 "ImportPage.c"
+				goto __finally74;
 			}
 		}
-		__finally72:
+		__finally74:
 		{
 			GFile* _tmp54_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp54_ = assoc_dest;
-#line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			library_monitor_unblacklist_file (_tmp54_);
-#line 12702 "ImportPage.c"
+#line 12855 "ImportPage.c"
 		}
-#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
-#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (assoc_dest);
-#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (dest_file);
-#line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12714 "ImportPage.c"
+#line 12867 "ImportPage.c"
 		}
-#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12718 "ImportPage.c"
+#line 12871 "ImportPage.c"
 	}
-#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = dest_file;
-#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_vala_file_to_import);
-#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_file_to_import = _tmp56_;
-#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_copy_to_library = FALSE;
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (dest_file);
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file_to_import) {
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file_to_import = _vala_file_to_import;
-#line 12738 "ImportPage.c"
+#line 12891 "ImportPage.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12742 "ImportPage.c"
+#line 12895 "ImportPage.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (copy_to_library) {
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 12748 "ImportPage.c"
+#line 12901 "ImportPage.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12752 "ImportPage.c"
+#line 12905 "ImportPage.c"
 }
 
 
@@ -12766,153 +12919,153 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 	gboolean ret = FALSE;
 	MediaSource* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
-#line 611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
-#line 612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	ret = FALSE;
-#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = source;
-#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12774 "ImportPage.c"
+#line 12927 "ImportPage.c"
 		Photo* photo = NULL;
 		MediaSource* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		BackingPhotoRow* _tmp3_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = source;
-#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO) ? ((Photo*) _tmp1_) : NULL);
-#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		photo = _tmp2_;
-#line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->associated_file;
-#line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ != NULL) {
-#line 12789 "ImportPage.c"
+#line 12942 "ImportPage.c"
 			Photo* _tmp4_ = NULL;
 			BackingPhotoRow* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
 			ConfigFacade* _tmp7_ = NULL;
 			ConfigFacade* _tmp8_ = NULL;
 			RawDeveloper _tmp9_ = 0;
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = photo;
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = self->priv->associated_file;
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			photo_add_backing_photo_for_development (_tmp4_, RAW_DEVELOPER_CAMERA, _tmp5_, &_inner_error_);
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_propagate_error (error, _inner_error_);
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return FALSE;
-#line 12810 "ImportPage.c"
+#line 12963 "ImportPage.c"
 			}
-#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			ret = TRUE;
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = photo;
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = config_facade_get_instance ();
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _tmp7_;
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			photo_set_raw_developer (_tmp6_, _tmp9_);
-#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 12826 "ImportPage.c"
+#line 12979 "ImportPage.c"
 		}
-#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo);
-#line 12830 "ImportPage.c"
+#line 12983 "ImportPage.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
-#line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12836 "ImportPage.c"
+#line 12989 "ImportPage.c"
 }
 
 
 static void import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass) {
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_camera_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->finalize = import_page_camera_import_job_finalize;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPageCameraImportJobPrivate));
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_duplicated_file = import_page_camera_import_job_real_get_duplicated_file;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_exposure_time_override = import_page_camera_import_job_real_get_exposure_time_override;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_dest_identifier = import_page_camera_import_job_real_get_dest_identifier;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_source_identifier = import_page_camera_import_job_real_get_source_identifier;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_basename = import_page_camera_import_job_real_get_basename;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->get_path = import_page_camera_import_job_real_get_path;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->set_associated = import_page_camera_import_job_real_set_associated;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->is_directory = import_page_camera_import_job_real_is_directory;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->determine_file_size = import_page_camera_import_job_real_determine_file_size;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->complete = import_page_camera_import_job_real_complete;
-#line 12869 "ImportPage.c"
+#line 13022 "ImportPage.c"
 }
 
 
 static void import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self) {
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE (self);
-#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = NULL;
-#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated_file = NULL;
-#line 12880 "ImportPage.c"
+#line 13033 "ImportPage.c"
 }
 
 
 static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
 	ImportPageCameraImportJob * self;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_context_wrapper_unref0 (self->priv->context);
-#line 474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->import_file);
-#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->fulldir);
-#line 477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->filename);
-#line 479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_media_metadata_unref0 (self->priv->metadata);
-#line 481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_batch_import_job_unref0 (self->priv->associated);
-#line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_backing_photo_row_unref0 (self->priv->associated_file);
-#line 483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->duplicated_file);
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 12908 "ImportPage.c"
+#line 13061 "ImportPage.c"
 }
 
 
@@ -12931,13 +13084,13 @@ static GType import_page_camera_import_job_get_type (void) {
 static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) {
 	ImportPageImportPageSearchViewFilter * self;
 	guint result = 0U;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
-#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
-#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12933 "ImportPage.c"
+#line 13086 "ImportPage.c"
 }
 
 
@@ -12945,19 +13098,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 12953 "ImportPage.c"
+#line 13106 "ImportPage.c"
 }
 
 
@@ -12970,186 +13123,186 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	guint _tmp26_ = 0U;
-#line 632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
-#line 632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = view;
-#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source = _tmp1_;
-#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_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"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 12980 "ImportPage.c"
+#line 13133 "ImportPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/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"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp4_;
-#line 12986 "ImportPage.c"
+#line 13139 "ImportPage.c"
 	} else {
-#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 12990 "ImportPage.c"
+#line 13143 "ImportPage.c"
 	}
-#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 12994 "ImportPage.c"
+#line 13147 "ImportPage.c"
 		ImportSource* _tmp5_ = NULL;
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = source;
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13000 "ImportPage.c"
+#line 13153 "ImportPage.c"
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
-#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _tmp6_;
-#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp7_) {
-#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				result = FALSE;
-#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (source);
-#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return result;
-#line 13015 "ImportPage.c"
+#line 13168 "ImportPage.c"
 			}
 		} else {
 			ImportSource* _tmp8_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = source;
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13023 "ImportPage.c"
+#line 13176 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
 				ImportSource* _tmp9_ = NULL;
 				PhotoImportSource* _tmp10_ = NULL;
 				PhotoImportSource* _tmp11_ = NULL;
 				PhotoFileFormat _tmp12_ = 0;
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = source;
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL);
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				photo = _tmp10_;
-#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp11_ = photo;
-#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = photo_import_source_get_file_format (_tmp11_);
-#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13041 "ImportPage.c"
+#line 13194 "ImportPage.c"
 					PhotoImportSource* _tmp13_ = NULL;
 					PhotoImportSource* _tmp14_ = NULL;
 					PhotoImportSource* _tmp15_ = NULL;
 					gboolean _tmp16_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp13_ = photo;
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp14_ = photo_import_source_get_associated (_tmp13_);
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp15_ = _tmp14_;
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = _tmp15_ != NULL;
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp15_);
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp16_) {
-#line 13058 "ImportPage.c"
+#line 13211 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
 						gboolean _tmp18_ = FALSE;
 						gboolean _tmp19_ = FALSE;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp19_ = _tmp18_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13068 "ImportPage.c"
+#line 13221 "ImportPage.c"
 							gboolean _tmp20_ = FALSE;
 							gboolean _tmp21_ = FALSE;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp21_ = _tmp20_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13077 "ImportPage.c"
+#line 13230 "ImportPage.c"
 						} else {
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13081 "ImportPage.c"
+#line 13234 "ImportPage.c"
 						}
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							result = FALSE;
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (photo);
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (source);
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13093 "ImportPage.c"
+#line 13246 "ImportPage.c"
 						}
 					} else {
 						gboolean _tmp22_ = FALSE;
 						gboolean _tmp23_ = FALSE;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp23_ = _tmp22_;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp23_) {
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							result = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (photo);
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (source);
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13112 "ImportPage.c"
+#line 13265 "ImportPage.c"
 						}
 					}
 				} else {
 					gboolean _tmp24_ = FALSE;
 					gboolean _tmp25_ = FALSE;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = _tmp24_;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp25_) {
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						result = FALSE;
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (photo);
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (source);
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13132 "ImportPage.c"
+#line 13285 "ImportPage.c"
 					}
 				}
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13137 "ImportPage.c"
+#line 13290 "ImportPage.c"
 			}
 		}
 	}
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_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"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13145 "ImportPage.c"
+#line 13298 "ImportPage.c"
 		const gchar* keywords = NULL;
 		ImportSource* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -13157,104 +13310,104 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 		gboolean _tmp30_ = FALSE;
 		gint _tmp31_ = 0;
 		gchar** _tmp32_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = source;
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable));
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		keywords = _tmp28_;
-#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = keywords;
-#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = is_string_empty (_tmp29_);
-#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp30_) {
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = FALSE;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (source);
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 13171 "ImportPage.c"
+#line 13324 "ImportPage.c"
 		}
-#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 668 "/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 13175 "ImportPage.c"
+#line 13328 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
 			gint _word_collection_size_ = 0;
 			gint word_it = 0;
-#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			word_collection = _tmp32_;
-#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			word_collection_length1 = _tmp31_;
-#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13187 "ImportPage.c"
+#line 13340 "ImportPage.c"
 				const gchar* word = NULL;
-#line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13191 "ImportPage.c"
+#line 13344 "ImportPage.c"
 				{
 					const gchar* _tmp33_ = NULL;
 					const gchar* _tmp34_ = NULL;
 					gboolean _tmp35_ = FALSE;
-#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = keywords;
-#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = word;
-#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = string_contains (_tmp33_, _tmp34_);
-#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp35_) {
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						result = FALSE;
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (source);
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13210 "ImportPage.c"
+#line 13363 "ImportPage.c"
 					}
 				}
 			}
 		}
 	}
-#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (source);
-#line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13222 "ImportPage.c"
+#line 13375 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) {
 	ImportPageImportPageSearchViewFilter* self = NULL;
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13232 "ImportPage.c"
+#line 13385 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/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 13239 "ImportPage.c"
+#line 13392 "ImportPage.c"
 }
 
 
 static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) {
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria;
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate;
-#line 13250 "ImportPage.c"
+#line 13403 "ImportPage.c"
 }
 
 
@@ -13279,45 +13432,45 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 	gboolean result = FALSE;
 	DataView* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
-#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = view;
-#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = !_tmp1_;
-#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13287 "ImportPage.c"
+#line 13440 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) {
 	ImportPageHideImportedViewFilter* self = NULL;
-#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
-#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13297 "ImportPage.c"
+#line 13450 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
-#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13304 "ImportPage.c"
+#line 13457 "ImportPage.c"
 }
 
 
 static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) {
-#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate;
-#line 13313 "ImportPage.c"
+#line 13466 "ImportPage.c"
 }
 
 
@@ -13338,35 +13491,37 @@ static GType import_page_hide_imported_view_filter_get_type (void) {
 
 
 static void import_page_class_init (ImportPageClass * klass) {
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_parent_class = g_type_class_peek_parent (klass);
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_type_class_add_private (klass, sizeof (ImportPagePrivate));
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->get_toolbar = import_page_real_get_toolbar;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = import_page_real_get_view_tracker;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = import_page_real_get_view_empty_message;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = import_page_real_get_filter_no_match_message;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/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"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->add_actions = import_page_real_add_actions;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	((PageClass *) klass)->remove_actions = import_page_real_remove_actions;
+#line 465 "/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"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->switched_to = import_page_real_switched_to;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->ready = import_page_real_ready;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = import_page_real_set_display_titles;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13362 "ImportPage.c"
+#line 13517 "ImportPage.c"
 }
 
 
@@ -13375,43 +13530,43 @@ static void import_page_instance_init (ImportPage * self) {
 	GtkProgressBar* _tmp1_ = NULL;
 	ImportPageImportPageSearchViewFilter* _tmp2_ = NULL;
 	ImportPageHideImportedViewFilter* _tmp3_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_GET_PRIVATE (self);
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->import_sources = NULL;
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = (GtkLabel*) gtk_label_new (NULL);
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->camera_label = _tmp0_;
-#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->progress_bar = _tmp1_;
-#line 686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->busy = FALSE;
-#line 687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refreshed = FALSE;
-#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = GP_OK;
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->volume_monitor = NULL;
-#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->local_ref = NULL;
-#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = import_page_import_page_search_view_filter_new ();
-#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->search_filter = _tmp2_;
-#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_hide_imported_view_filter_new ();
-#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->hide_imported_filter = _tmp3_;
-#line 13407 "ImportPage.c"
+#line 13562 "ImportPage.c"
 }
 
 
@@ -13421,51 +13576,51 @@ static void import_page_finalize (GObject* obj) {
 	guint _tmp1_ = 0U;
 	VideoSourceCollection* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage);
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = library_photo_global;
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.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) _import_page_on_media_added_removed_data_collection_contents_altered, self);
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = video_global;
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.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) _import_page_on_media_added_removed_data_collection_contents_altered, self);
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (self->priv->import_sources);
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->camera_label);
-#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->hide_imported);
-#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->uri);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
-#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->camera_name);
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->volume_monitor);
-#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->local_ref);
-#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->icon);
-#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_filter_unref0 (self->priv->hide_imported_filter);
-#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13461 "ImportPage.c"
+#line 13616 "ImportPage.c"
 }
 
 
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 92445bb..4e055ec 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -338,14 +338,22 @@ class ImportPreview : MediaSourceItem {
                 uint64 filesize = get_import_source().get_filesize();
                 // unlikely to be a problem, but what the hay
                 if (filesize <= int64.MAX) {
-                    if (LibraryPhoto.global.has_basename_filesize_duplicate(
-                        get_import_source().get_filename(), (int64) filesize)) {
+                    PhotoID duplicated_photo_id = LibraryPhoto.global.get_basename_filesize_duplicate(
+                                get_import_source().get_filename(), (int64) filesize);
+
+                    if (duplicated_photo_id.is_valid()) {
+                        // Check exposure timestamp
+                        LibraryPhoto duplicated_photo = LibraryPhoto.global.fetch(duplicated_photo_id);
+                        time_t photo_exposure_time = photo_import_source.get_exposure_time();
+                        time_t duplicated_photo_exposure_time = duplicated_photo.get_exposure_time();
                         
-                        duplicated_file = DuplicatedFile.create_from_photo_id(
-                            LibraryPhoto.global.get_basename_filesize_duplicate(
-                            get_import_source().get_filename(), (int64) filesize));
-                        
-                        return true;
+                        if (photo_exposure_time == duplicated_photo_exposure_time) {
+                            duplicated_file = DuplicatedFile.create_from_photo_id(
+                                LibraryPhoto.global.get_basename_filesize_duplicate(
+                                get_import_source().get_filename(), (int64) filesize));
+
+                            return true;
+                        }
                     }
                 }
             }
@@ -801,6 +809,7 @@ public class ImportPage : CheckerboardPage {
             
             // Find button
             Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
+            find_button.set_icon_name("edit-find");
             find_button.set_action_name ("win.CommonDisplaySearchbar");
             
             toolbar.insert(find_button, -1);
@@ -810,14 +819,20 @@ 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_icon_name("import");
+            import_selected_button.set_label(_("Import _Selected"));
+            import_selected_button.is_important = true;
+            import_selected_button.use_underline = true;
             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_icon_name("import-all");
+            import_all_button.set_label(_("Import _All"));
+            import_all_button.is_important = true;
+            import_all_button.use_underline = true;
             import_all_button.set_action_name ("win.ImportAll");
             
             toolbar.insert(import_all_button, -1);
@@ -872,14 +887,21 @@ public class ImportPage : CheckerboardPage {
         { "ViewTitle", on_action_toggle, null, "false", on_display_titles },
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
 
         get_action ("ViewTitle").change_state (Config.Facade.get_instance ().get_display_photo_titles ());
     }
-    
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
     public GPhoto.Camera get_camera() {
         return camera;
     }
diff --git a/src/config/Config.c b/src/config/Config.c
index a8afbd2..a4faeb0 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.32.1, the Vala compiler
+/* Config.c generated by valac 0.34.4, the Vala compiler
  * generated from Config.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 3b5e59a..09a6eb1 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -1,4 +1,4 @@
-/* ConfigurationInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* ConfigurationInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from ConfigurationInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch79_configuration_error;
+				goto __catch81_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 __finally79;
-	__catch79_configuration_error:
+	goto __finally81;
+	__catch81_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"
 	}
-	__finally79:
+	__finally81:
 #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 __catch80_configuration_error;
+				goto __catch82_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 __finally80;
-	__catch80_configuration_error:
+	goto __finally82;
+	__catch82_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"
 	}
-	__finally80:
+	__finally82:
 #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 __catch81_configuration_error;
+				goto __catch83_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 __finally81;
-	__catch81_configuration_error:
+	goto __finally83;
+	__catch83_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"
 	}
-	__finally81:
+	__finally83:
 #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 __catch82_configuration_error;
+				goto __catch84_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 __finally82;
-	__catch82_configuration_error:
+	goto __finally84;
+	__catch84_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"
 	}
-	__finally82:
+	__finally84:
 #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 __catch83_configuration_error;
+				goto __catch85_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 __finally83;
-	__catch83_configuration_error:
+	goto __finally85;
+	__catch85_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"
 	}
-	__finally83:
+	__finally85:
 #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 __catch84_configuration_error;
+				goto __catch86_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 __finally84;
-	__catch84_configuration_error:
+	goto __finally86;
+	__catch86_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"
 	}
-	__finally84:
+	__finally86:
 #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 __catch85_configuration_error;
+				goto __catch87_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 __finally85;
-	__catch85_configuration_error:
+	goto __finally87;
+	__catch87_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"
 	}
-	__finally85:
+	__finally87:
 #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 __catch86_configuration_error;
+				goto __catch88_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 __catch86_configuration_error;
+				goto __catch88_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 __finally86;
-	__catch86_configuration_error:
+	goto __finally88;
+	__catch88_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"
 	}
-	__finally86:
+	__finally88:
 #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 __catch87_configuration_error;
+				goto __catch89_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 __finally87;
-	__catch87_configuration_error:
+	goto __finally89;
+	__catch89_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"
 	}
-	__finally87:
+	__finally89:
 #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 __catch88_configuration_error;
+				goto __catch90_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 __catch88_configuration_error;
+				goto __catch90_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 __finally88;
-	__catch88_configuration_error:
+	goto __finally90;
+	__catch90_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"
 	}
-	__finally88:
+	__finally90:
 #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 __catch89_configuration_error;
+				goto __catch91_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 __finally89;
-	__catch89_configuration_error:
+	goto __finally91;
+	__catch91_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"
 	}
-	__finally89:
+	__finally91:
 #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 __catch90_configuration_error;
+				goto __catch92_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 __finally90;
-	__catch90_configuration_error:
+	goto __finally92;
+	__catch92_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"
 	}
-	__finally90:
+	__finally92:
 #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 __catch91_configuration_error;
+				goto __catch93_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 __finally91;
-	__catch91_configuration_error:
+	goto __finally93;
+	__catch93_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"
 	}
-	__finally91:
+	__finally93:
 #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 __catch92_configuration_error;
+				goto __catch94_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 __finally92;
-	__catch92_configuration_error:
+	goto __finally94;
+	__catch94_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"
 	}
-	__finally92:
+	__finally94:
 #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 __catch93_configuration_error;
+				goto __catch95_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 __catch93_configuration_error;
+				goto __catch95_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 __catch93_configuration_error;
+				goto __catch95_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 __finally93;
-	__catch93_configuration_error:
+	goto __finally95;
+	__catch95_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"
 	}
-	__finally93:
+	__finally95:
 #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 __catch94_configuration_error;
+				goto __catch96_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 __catch94_configuration_error;
+				goto __catch96_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 __catch94_configuration_error;
+				goto __catch96_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 __finally94;
-	__catch94_configuration_error:
+	goto __finally96;
+	__catch96_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"
 	}
-	__finally94:
+	__finally96:
 #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 __catch95_configuration_error;
+				goto __catch97_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 __finally95;
-	__catch95_configuration_error:
+	goto __finally97;
+	__catch97_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"
 	}
-	__finally95:
+	__finally97:
 #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 __catch96_configuration_error;
+				goto __catch98_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 __finally96;
-	__catch96_configuration_error:
+	goto __finally98;
+	__catch98_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"
 	}
-	__finally96:
+	__finally98:
 #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 __catch97_configuration_error;
+				goto __catch99_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 __finally97;
-	__catch97_configuration_error:
+	goto __finally99;
+	__catch99_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"
 	}
-	__finally97:
+	__finally99:
 #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 __catch98_configuration_error;
+				goto __catch100_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 __finally98;
-	__catch98_configuration_error:
+	goto __finally100;
+	__catch100_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"
 	}
-	__finally98:
+	__finally100:
 #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 __catch99_configuration_error;
+				goto __catch101_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 __finally99;
-	__catch99_configuration_error:
+	goto __finally101;
+	__catch101_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"
 	}
-	__finally99:
+	__finally101:
 #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 __catch100_configuration_error;
+				goto __catch102_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 __finally100;
-	__catch100_configuration_error:
+	goto __finally102;
+	__catch102_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"
 	}
-	__finally100:
+	__finally102:
 #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 __catch101_configuration_error;
+				goto __catch103_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 __finally101;
-	__catch101_configuration_error:
+	goto __finally103;
+	__catch103_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"
 	}
-	__finally101:
+	__finally103:
 #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 __catch102_configuration_error;
+				goto __catch104_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 __finally102;
-	__catch102_configuration_error:
+	goto __finally104;
+	__catch104_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"
 	}
-	__finally102:
+	__finally104:
 #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 __catch103_configuration_error;
+				goto __catch105_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 __finally103;
-	__catch103_configuration_error:
+	goto __finally105;
+	__catch105_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"
 	}
-	__finally103:
+	__finally105:
 #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 __catch104_configuration_error;
+				goto __catch106_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 __finally104;
-	__catch104_configuration_error:
+	goto __finally106;
+	__catch106_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"
 	}
-	__finally104:
+	__finally106:
 #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 __catch105_configuration_error;
+				goto __catch107_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 __finally105;
-	__catch105_configuration_error:
+	goto __finally107;
+	__catch107_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"
 	}
-	__finally105:
+	__finally107:
 #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 __catch106_configuration_error;
+				goto __catch108_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 __finally106;
-	__catch106_configuration_error:
+	goto __finally108;
+	__catch108_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"
 	}
-	__finally106:
+	__finally108:
 #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 __catch107_configuration_error;
+				goto __catch109_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 __finally107;
-	__catch107_configuration_error:
+	goto __finally109;
+	__catch109_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"
 	}
-	__finally107:
+	__finally109:
 #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 __catch108_configuration_error;
+				goto __catch110_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 __finally108;
-	__catch108_configuration_error:
+	goto __finally110;
+	__catch110_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"
 	}
-	__finally108:
+	__finally110:
 #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 __catch109_configuration_error;
+				goto __catch111_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 __finally109;
-	__catch109_configuration_error:
+	goto __finally111;
+	__catch111_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"
 	}
-	__finally109:
+	__finally111:
 #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 __catch110_configuration_error;
+				goto __catch112_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 __finally110;
-	__catch110_configuration_error:
+	goto __finally112;
+	__catch112_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"
 	}
-	__finally110:
+	__finally112:
 #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 __catch111_configuration_error;
+				goto __catch113_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 __finally111;
-	__catch111_configuration_error:
+	goto __finally113;
+	__catch113_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"
 	}
-	__finally111:
+	__finally113:
 #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 __catch112_configuration_error;
+				goto __catch114_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 __finally112;
-	__catch112_configuration_error:
+	goto __finally114;
+	__catch114_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"
 	}
-	__finally112:
+	__finally114:
 #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 __catch113_configuration_error;
+				goto __catch115_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 __finally113;
-	__catch113_configuration_error:
+	goto __finally115;
+	__catch115_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"
 	}
-	__finally113:
+	__finally115:
 #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 __catch114_configuration_error;
+				goto __catch116_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 __finally114;
-	__catch114_configuration_error:
+	goto __finally116;
+	__catch116_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"
 	}
-	__finally114:
+	__finally116:
 #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 __catch115_configuration_error;
+				goto __catch117_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 __catch115_configuration_error;
+				goto __catch117_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 __finally115;
-	__catch115_configuration_error:
+	goto __finally117;
+	__catch117_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"
 	}
-	__finally115:
+	__finally117:
 #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 __catch116_configuration_error;
+				goto __catch118_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 __catch116_configuration_error;
+				goto __catch118_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 __finally116;
-	__catch116_configuration_error:
+	goto __finally118;
+	__catch118_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"
 	}
-	__finally116:
+	__finally118:
 #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 __catch117_configuration_error;
+				goto __catch119_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 __finally117;
-	__catch117_configuration_error:
+	goto __finally119;
+	__catch119_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"
 	}
-	__finally117:
+	__finally119:
 #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 __catch118_configuration_error;
+				goto __catch120_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 __finally118;
-	__catch118_configuration_error:
+	goto __finally120;
+	__catch120_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"
 	}
-	__finally118:
+	__finally120:
 #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 __catch119_configuration_error;
+				goto __catch121_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 __finally119;
-	__catch119_configuration_error:
+	goto __finally121;
+	__catch121_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"
 	}
-	__finally119:
+	__finally121:
 #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 __catch120_configuration_error;
+				goto __catch122_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 __finally120;
-	__catch120_configuration_error:
+	goto __finally122;
+	__catch122_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"
 	}
-	__finally120:
+	__finally122:
 #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 __catch121_configuration_error;
+				goto __catch123_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 __finally121;
-	__catch121_configuration_error:
+	goto __finally123;
+	__catch123_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"
 	}
-	__finally121:
+	__finally123:
 #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 __catch122_configuration_error;
+				goto __catch124_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 __finally122;
-	__catch122_configuration_error:
+	goto __finally124;
+	__catch124_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"
 	}
-	__finally122:
+	__finally124:
 #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 __catch123_configuration_error;
+				goto __catch125_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 __finally123;
-	__catch123_configuration_error:
+	goto __finally125;
+	__catch125_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"
 	}
-	__finally123:
+	__finally125:
 #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 __catch124_configuration_error;
+				goto __catch126_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 __finally124;
-	__catch124_configuration_error:
+	goto __finally126;
+	__catch126_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"
 	}
-	__finally124:
+	__finally126:
 #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 __catch125_configuration_error;
+				goto __catch127_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 __finally125;
-	__catch125_configuration_error:
+	goto __finally127;
+	__catch127_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"
 	}
-	__finally125:
+	__finally127:
 #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 __catch126_configuration_error;
+				goto __catch128_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 __finally126;
-	__catch126_configuration_error:
+	goto __finally128;
+	__catch128_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"
 	}
-	__finally126:
+	__finally128:
 #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 __catch127_configuration_error;
+				goto __catch129_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 __finally127;
-	__catch127_configuration_error:
+	goto __finally129;
+	__catch129_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"
 	}
-	__finally127:
+	__finally129:
 #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 __catch128_configuration_error;
+				goto __catch130_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 __finally128;
-	__catch128_configuration_error:
+	goto __finally130;
+	__catch130_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"
 	}
-	__finally128:
+	__finally130:
 #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 __catch129_configuration_error;
+				goto __catch131_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 __finally129;
-	__catch129_configuration_error:
+	goto __finally131;
+	__catch131_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"
 	}
-	__finally129:
+	__finally131:
 #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 __catch130_configuration_error;
+				goto __catch132_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 __finally130;
-	__catch130_configuration_error:
+	goto __finally132;
+	__catch132_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"
 	}
-	__finally130:
+	__finally132:
 #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 __catch131_configuration_error;
+				goto __catch133_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 __finally131;
-	__catch131_configuration_error:
+	goto __finally133;
+	__catch133_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"
 	}
-	__finally131:
+	__finally133:
 #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 __catch132_configuration_error;
+				goto __catch134_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 __finally132;
-	__catch132_configuration_error:
+	goto __finally134;
+	__catch134_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"
 	}
-	__finally132:
+	__finally134:
 #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 __catch133_configuration_error;
+				goto __catch135_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 __finally133;
-	__catch133_configuration_error:
+	goto __finally135;
+	__catch135_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"
 	}
-	__finally133:
+	__finally135:
 #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 __catch134_configuration_error;
+				goto __catch136_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 __finally134;
-	__catch134_configuration_error:
+	goto __finally136;
+	__catch136_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"
 	}
-	__finally134:
+	__finally136:
 #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 __catch135_configuration_error;
+				goto __catch137_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 __finally135;
-	__catch135_configuration_error:
+	goto __finally137;
+	__catch137_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"
 	}
-	__finally135:
+	__finally137:
 #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 __catch136_configuration_error;
+				goto __catch138_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 __finally136;
-	__catch136_configuration_error:
+	goto __finally138;
+	__catch138_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"
 	}
-	__finally136:
+	__finally138:
 #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 __catch137_configuration_error;
+				goto __catch139_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 __finally137;
-	__catch137_configuration_error:
+	goto __finally139;
+	__catch139_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"
 	}
-	__finally137:
+	__finally139:
 #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 __catch138_configuration_error;
+				goto __catch140_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 __finally138;
-	__catch138_configuration_error:
+	goto __finally140;
+	__catch140_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"
 	}
-	__finally138:
+	__finally140:
 #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 __catch139_configuration_error;
+				goto __catch141_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 __finally139;
-	__catch139_configuration_error:
+	goto __finally141;
+	__catch141_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"
 	}
-	__finally139:
+	__finally141:
 #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 __catch140_configuration_error;
+				goto __catch142_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 __finally140;
-	__catch140_configuration_error:
+	goto __finally142;
+	__catch142_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"
 	}
-	__finally140:
+	__finally142:
 #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 __catch141_configuration_error;
+				goto __catch143_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 __finally141;
-	__catch141_configuration_error:
+	goto __finally143;
+	__catch143_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"
 	}
-	__finally141:
+	__finally143:
 #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 __catch142_configuration_error;
+				goto __catch144_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 __finally142;
-	__catch142_configuration_error:
+	goto __finally144;
+	__catch144_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"
 	}
-	__finally142:
+	__finally144:
 #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 __catch143_configuration_error;
+				goto __catch145_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 __finally143;
-	__catch143_configuration_error:
+	goto __finally145;
+	__catch145_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"
 	}
-	__finally143:
+	__finally145:
 #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 __catch144_configuration_error;
+				goto __catch146_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 __finally144;
-	__catch144_configuration_error:
+	goto __finally146;
+	__catch146_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"
 	}
-	__finally144:
+	__finally146:
 #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 __catch145_configuration_error;
+				goto __catch147_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 __finally145;
-	__catch145_configuration_error:
+	goto __finally147;
+	__catch147_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"
 	}
-	__finally145:
+	__finally147:
 #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 __catch146_configuration_error;
+				goto __catch148_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 __finally146;
-	__catch146_configuration_error:
+	goto __finally148;
+	__catch148_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"
 	}
-	__finally146:
+	__finally148:
 #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 __catch147_configuration_error;
+				goto __catch149_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 __finally147;
-	__catch147_configuration_error:
+	goto __finally149;
+	__catch149_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"
 	}
-	__finally147:
+	__finally149:
 #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 __catch148_configuration_error;
+				goto __catch150_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 __finally148;
-	__catch148_configuration_error:
+	goto __finally150;
+	__catch150_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"
 	}
-	__finally148:
+	__finally150:
 #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 __catch149_configuration_error;
+				goto __catch151_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 __finally149;
-	__catch149_configuration_error:
+	goto __finally151;
+	__catch151_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"
 	}
-	__finally149:
+	__finally151:
 #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 __catch150_configuration_error;
+				goto __catch152_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 __finally150;
-	__catch150_configuration_error:
+	goto __finally152;
+	__catch152_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"
 	}
-	__finally150:
+	__finally152:
 #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 __catch151_configuration_error;
+				goto __catch153_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 __finally151;
-	__catch151_configuration_error:
+	goto __finally153;
+	__catch153_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"
 	}
-	__finally151:
+	__finally153:
 #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 __catch152_configuration_error;
+				goto __catch154_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 __finally152;
-	__catch152_configuration_error:
+	goto __finally154;
+	__catch154_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"
 	}
-	__finally152:
+	__finally154:
 #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 __catch153_configuration_error;
+				goto __catch155_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 __finally153;
-	__catch153_configuration_error:
+	goto __finally155;
+	__catch155_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"
 	}
-	__finally153:
+	__finally155:
 #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 __catch154_configuration_error;
+				goto __catch156_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 __finally154;
-	__catch154_configuration_error:
+	goto __finally156;
+	__catch156_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"
 	}
-	__finally154:
+	__finally156:
 #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 __catch155_configuration_error;
+				goto __catch157_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 __catch155_configuration_error;
+				goto __catch157_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 __finally155;
-	__catch155_configuration_error:
+	goto __finally157;
+	__catch157_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"
 	}
-	__finally155:
+	__finally157:
 #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 __catch156_configuration_error;
+				goto __catch158_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 __catch156_configuration_error;
+				goto __catch158_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 __finally156;
-	__catch156_configuration_error:
+	goto __finally158;
+	__catch158_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"
 	}
-	__finally156:
+	__finally158:
 #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 __catch157_configuration_error;
+				goto __catch159_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 __catch157_configuration_error;
+				goto __catch159_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 __catch157_configuration_error;
+				goto __catch159_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 __finally157;
-	__catch157_configuration_error:
+	goto __finally159;
+	__catch159_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"
 	}
-	__finally157:
+	__finally159:
 #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 __catch158_configuration_error;
+				goto __catch160_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 __catch158_configuration_error;
+				goto __catch160_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 __catch158_configuration_error;
+				goto __catch160_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 __finally158;
-	__catch158_configuration_error:
+	goto __finally160;
+	__catch160_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"
 	}
-	__finally158:
+	__finally160:
 #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 __catch159_configuration_error;
+				goto __catch161_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 __finally159;
-	__catch159_configuration_error:
+	goto __finally161;
+	__catch161_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"
 	}
-	__finally159:
+	__finally161:
 #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 __catch160_configuration_error;
+				goto __catch162_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 __finally160;
-	__catch160_configuration_error:
+	goto __finally162;
+	__catch162_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"
 	}
-	__finally160:
+	__finally162:
 #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 __catch161_configuration_error;
+				goto __catch163_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 __finally161;
-	__catch161_configuration_error:
+	goto __finally163;
+	__catch163_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"
 	}
-	__finally161:
+	__finally163:
 #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 __catch162_configuration_error;
+				goto __catch164_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 __finally162;
-	__catch162_configuration_error:
+	goto __finally164;
+	__catch164_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"
 	}
-	__finally162:
+	__finally164:
 #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 __catch163_configuration_error;
+				goto __catch165_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 __finally163;
-	__catch163_configuration_error:
+	goto __finally165;
+	__catch165_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"
 	}
-	__finally163:
+	__finally165:
 #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 __catch164_configuration_error;
+				goto __catch166_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 __finally164;
-	__catch164_configuration_error:
+	goto __finally166;
+	__catch166_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"
 	}
-	__finally164:
+	__finally166:
 #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 __catch165_configuration_error;
+				goto __catch167_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 __finally165;
-	__catch165_configuration_error:
+	goto __finally167;
+	__catch167_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"
 	}
-	__finally165:
+	__finally167:
 #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 __catch166_configuration_error;
+				goto __catch168_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 __finally166;
-	__catch166_configuration_error:
+	goto __finally168;
+	__catch168_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"
 	}
-	__finally166:
+	__finally168:
 #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 __catch167_configuration_error;
+				goto __catch169_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 __finally167;
-	__catch167_configuration_error:
+	goto __finally169;
+	__catch169_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"
 	}
-	__finally167:
+	__finally169:
 #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 __catch168_configuration_error;
+				goto __catch170_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 __finally168;
-	__catch168_configuration_error:
+	goto __finally170;
+	__catch170_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"
 	}
-	__finally168:
+	__finally170:
 #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 __catch169_configuration_error;
+				goto __catch171_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 __finally169;
-	__catch169_configuration_error:
+	goto __finally171;
+	__catch171_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"
 	}
-	__finally169:
+	__finally171:
 #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 __catch170_configuration_error;
+				goto __catch172_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 __finally170;
-	__catch170_configuration_error:
+	goto __finally172;
+	__catch172_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"
 	}
-	__finally170:
+	__finally172:
 #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 __catch171_configuration_error;
+				goto __catch173_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 __finally171;
-	__catch171_configuration_error:
+	goto __finally173;
+	__catch173_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"
 	}
-	__finally171:
+	__finally173:
 #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 __catch172_configuration_error;
+				goto __catch174_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 __finally172;
-	__catch172_configuration_error:
+	goto __finally174;
+	__catch174_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"
 	}
-	__finally172:
+	__finally174:
 #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 __catch173_configuration_error;
+				goto __catch175_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 __finally173;
-	__catch173_configuration_error:
+	goto __finally175;
+	__catch175_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"
 	}
-	__finally173:
+	__finally175:
 #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 __catch174_configuration_error;
+				goto __catch176_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 __finally174;
-	__catch174_configuration_error:
+	goto __finally176;
+	__catch176_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"
 	}
-	__finally174:
+	__finally176:
 #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 __catch175_configuration_error;
+				goto __catch177_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 __finally175;
-	__catch175_configuration_error:
+	goto __finally177;
+	__catch177_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"
 	}
-	__finally175:
+	__finally177:
 #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 __catch176_configuration_error;
+				goto __catch178_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 __finally176;
-	__catch176_configuration_error:
+	goto __finally178;
+	__catch178_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"
 	}
-	__finally176:
+	__finally178:
 #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 __catch177_configuration_error;
+				goto __catch179_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 __finally177;
-	__catch177_configuration_error:
+	goto __finally179;
+	__catch179_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"
 	}
-	__finally177:
+	__finally179:
 #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 __catch178_configuration_error;
+				goto __catch180_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 __finally178;
-	__catch178_configuration_error:
+	goto __finally180;
+	__catch180_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"
 	}
-	__finally178:
+	__finally180:
 #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 __catch179_configuration_error;
+				goto __catch181_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 __finally179;
-	__catch179_configuration_error:
+	goto __finally181;
+	__catch181_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"
 	}
-	__finally179:
+	__finally181:
 #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 __catch180_configuration_error;
+				goto __catch182_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 __finally180;
-	__catch180_configuration_error:
+	goto __finally182;
+	__catch182_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"
 	}
-	__finally180:
+	__finally182:
 #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 __catch181_configuration_error;
+				goto __catch183_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 __finally181;
-	__catch181_configuration_error:
+	goto __finally183;
+	__catch183_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"
 	}
-	__finally181:
+	__finally183:
 #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 __catch182_configuration_error;
+				goto __catch184_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 __finally182;
-	__catch182_configuration_error:
+	goto __finally184;
+	__catch184_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"
 	}
-	__finally182:
+	__finally184:
 #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 __catch183_configuration_error;
+				goto __catch185_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 __finally183;
-	__catch183_configuration_error:
+	goto __finally185;
+	__catch185_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"
 	}
-	__finally183:
+	__finally185:
 #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 __catch184_configuration_error;
+				goto __catch186_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 __finally184;
-	__catch184_configuration_error:
+	goto __finally186;
+	__catch186_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"
 	}
-	__finally184:
+	__finally186:
 #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 __catch185_configuration_error;
+				goto __catch187_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 __finally185;
-	__catch185_configuration_error:
+	goto __finally187;
+	__catch187_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"
 	}
-	__finally185:
+	__finally187:
 #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 __catch186_configuration_error;
+				goto __catch188_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 __finally186;
-	__catch186_configuration_error:
+	goto __finally188;
+	__catch188_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"
 	}
-	__finally186:
+	__finally188:
 #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 __catch187_configuration_error;
+				goto __catch189_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 __finally187;
-	__catch187_configuration_error:
+	goto __finally189;
+	__catch189_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"
 	}
-	__finally187:
+	__finally189:
 #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 __catch188_configuration_error;
+				goto __catch190_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 __finally188;
-	__catch188_configuration_error:
+	goto __finally190;
+	__catch190_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"
 	}
-	__finally188:
+	__finally190:
 #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 __catch189_configuration_error;
+				goto __catch191_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 __finally189;
-	__catch189_configuration_error:
+	goto __finally191;
+	__catch191_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"
 	}
-	__finally189:
+	__finally191:
 #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 __catch190_configuration_error;
+				goto __catch192_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 __finally190;
-	__catch190_configuration_error:
+	goto __finally192;
+	__catch192_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"
 	}
-	__finally190:
+	__finally192:
 #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 __catch191_configuration_error;
+				goto __catch193_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 __finally191;
-	__catch191_configuration_error:
+	goto __finally193;
+	__catch193_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"
 	}
-	__finally191:
+	__finally193:
 #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 __catch192_configuration_error;
+				goto __catch194_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 __finally192;
-	__catch192_configuration_error:
+	goto __finally194;
+	__catch194_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"
 	}
-	__finally192:
+	__finally194:
 #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 __catch193_configuration_error;
+				goto __catch195_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 __finally193;
-	__catch193_configuration_error:
+	goto __finally195;
+	__catch195_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"
 	}
-	__finally193:
+	__finally195:
 #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 __catch194_configuration_error;
+				goto __catch196_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 __finally194;
-	__catch194_configuration_error:
+	goto __finally196;
+	__catch196_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"
 	}
-	__finally194:
+	__finally196:
 #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"
@@ -11804,13 +11804,13 @@ void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, g
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 11811 "ConfigurationInterfaces.c"
 }
@@ -11828,35 +11828,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 11857 "ConfigurationInterfaces.c"
 }
@@ -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 __catch195_configuration_error;
+				goto __catch197_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 __finally195;
-	__catch195_configuration_error:
+	goto __finally197;
+	__catch197_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"
 	}
-	__finally195:
+	__finally197:
 #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 __catch196_configuration_error;
+				goto __catch198_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 __finally196;
-	__catch196_configuration_error:
+	goto __finally198;
+	__catch198_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"
 	}
-	__finally196:
+	__finally198:
 #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 __catch197_configuration_error;
+				goto __catch199_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 __finally197;
-	__catch197_configuration_error:
+	goto __finally199;
+	__catch199_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"
 	}
-	__finally197:
+	__finally199:
 #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 __catch198_configuration_error;
+				goto __catch200_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 __finally198;
-	__catch198_configuration_error:
+	goto __finally200;
+	__catch200_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"
 	}
-	__finally198:
+	__finally200:
 #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 __catch199_configuration_error;
+				goto __catch201_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 __finally199;
-	__catch199_configuration_error:
+	goto __finally201;
+	__catch201_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"
 	}
-	__finally199:
+	__finally201:
 #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 __catch200_configuration_error;
+				goto __catch202_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 __finally200;
-	__catch200_configuration_error:
+	goto __finally202;
+	__catch202_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"
 	}
-	__finally200:
+	__finally202:
 #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 10e5c92..6d9dfe0 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -1,4 +1,4 @@
-/* GSettingsEngine.c generated by valac 0.32.1, the Vala compiler
+/* GSettingsEngine.c generated by valac 0.34.4, the Vala compiler
  * generated from GSettingsEngine.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3338,11 +3338,11 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 3348 "GSettingsEngine.c"
 	{
@@ -3357,98 +3357,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3379 "GSettingsEngine.c"
-				goto __catch201_g_regex_error;
+				goto __catch203_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3388 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3404 "GSettingsEngine.c"
-				goto __catch201_g_regex_error;
+				goto __catch203_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3415 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3429 "GSettingsEngine.c"
 	}
-	goto __finally201;
-	__catch201_g_regex_error:
+	goto __finally203;
+	__catch203_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 3443 "GSettingsEngine.c"
 	}
-	__finally201:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally203:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 3454 "GSettingsEngine.c"
 	}
@@ -3460,19 +3460,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3478 "GSettingsEngine.c"
 }
@@ -3941,37 +3941,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 3957 "GSettingsEngine.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3965 "GSettingsEngine.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 3977 "GSettingsEngine.c"
 	}
@@ -3991,112 +3991,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 4001 "GSettingsEngine.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 4007 "GSettingsEngine.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 4011 "GSettingsEngine.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 4015 "GSettingsEngine.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 4027 "GSettingsEngine.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 4037 "GSettingsEngine.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 4043 "GSettingsEngine.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 4057 "GSettingsEngine.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 4067 "GSettingsEngine.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 4073 "GSettingsEngine.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 4082 "GSettingsEngine.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 4102 "GSettingsEngine.c"
 }
@@ -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 __catch202_configuration_error;
+				goto __catch204_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 __finally202;
-	__catch202_configuration_error:
+	goto __finally204;
+	__catch204_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"
 	}
-	__finally202:
+	__finally204:
 #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 __catch203_configuration_error;
+				goto __catch205_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 __finally203;
-	__catch203_configuration_error:
+	goto __finally205;
+	__catch205_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"
 	}
-	__finally203:
+	__finally205:
 #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 __catch204_configuration_error;
+				goto __catch206_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 __finally204;
-	__catch204_configuration_error:
+	goto __finally206;
+	__catch206_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"
 	}
-	__finally204:
+	__finally206:
 #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 __catch205_configuration_error;
+				goto __catch207_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 __finally205;
-	__catch205_configuration_error:
+	goto __finally207;
+	__catch207_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"
 	}
-	__finally205:
+	__finally207:
 #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 __catch206_configuration_error;
+				goto __catch208_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 __finally206;
-	__catch206_configuration_error:
+	goto __finally208;
+	__catch208_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"
 	}
-	__finally206:
+	__finally208:
 #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 __catch207_configuration_error;
+				goto __catch209_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 __finally207;
-	__catch207_configuration_error:
+	goto __finally209;
+	__catch209_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"
 	}
-	__finally207:
+	__finally209:
 #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 __catch208_configuration_error;
+				goto __catch210_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 __finally208;
-	__catch208_configuration_error:
+	goto __finally210;
+	__catch210_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"
 	}
-	__finally208:
+	__finally210:
 #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 __catch209_configuration_error;
+				goto __catch211_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 __finally209;
-	__catch209_configuration_error:
+	goto __finally211;
+	__catch211_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"
 	}
-	__finally209:
+	__finally211:
 #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 __catch210_configuration_error;
+				goto __catch212_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 __finally210;
-	__catch210_configuration_error:
+	goto __finally212;
+	__catch212_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"
 	}
-	__finally210:
+	__finally212:
 #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 __catch211_configuration_error;
+				goto __catch213_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 __finally211;
-	__catch211_configuration_error:
+	goto __finally213;
+	__catch213_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"
 	}
-	__finally211:
+	__finally213:
 #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 __catch212_configuration_error;
+				goto __catch214_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 __finally212;
-	__catch212_configuration_error:
+	goto __finally214;
+	__catch214_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"
 	}
-	__finally212:
+	__finally214:
 #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 __catch213_g_error;
+			goto __catch215_g_error;
 		}
 	}
-	goto __finally213;
-	__catch213_g_error:
+	goto __finally215;
+	__catch215_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"
 	}
-	__finally213:
+	__finally215:
 #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/Alteration.c b/src/core/Alteration.c
index 2bb624a..e9e435b 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.32.1, the Vala compiler
+/* Alteration.c generated by valac 0.34.4, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,19 +426,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 444 "Alteration.c"
 }
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index cd22228..26d26bd 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.34.4, the Vala compiler
  * generated from ContainerSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Core.c b/src/core/Core.c
index 7fd60d2..7316e4d 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.32.1, the Vala compiler
+/* Core.c generated by valac 0.34.4, the Vala compiler
  * generated from Core.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 7040412..6f03093 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.32.1, the Vala compiler
+/* DataCollection.c generated by valac 0.34.4, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 7aaf2eb..372fce2 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.32.1, the Vala compiler
+/* DataObject.c generated by valac 0.34.4, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index 75c2ca2..d0a3119 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.32.1, the Vala compiler
+/* DataSet.c generated by valac 0.34.4, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index cb4dfca..3009d24 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.32.1, the Vala compiler
+/* DataSource.c generated by valac 0.34.4, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch47_g_error;
+				goto __catch49_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 __finally47;
-		__catch47_g_error:
+		goto __finally49;
+		__catch49_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"
 		}
-		__finally47:
+		__finally49:
 #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"
@@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3373 "DataSource.c"
 }
@@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3514 "DataSource.c"
 }
@@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
 	const gchar* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3758 "DataSource.c"
 }
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index 0abd6e8..ea7d98a 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.34.4, the Vala compiler
  * generated from DataSourceTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 40153fc..2e70156 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.32.1, the Vala compiler
+/* DataView.c generated by valac 0.34.4, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 0e55db0..355700d 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataViewTypes.c generated by valac 0.34.4, the Vala compiler
  * generated from DataViewTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index b83be40..0de87db 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.34.4, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 6321f92..3cca952 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* SourceCollection.c generated by valac 0.34.4, the Vala compiler
  * generated from SourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch46_g_error;
+			goto __catch48_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 765 "SourceCollection.c"
 	}
-	goto __finally46;
-	__catch46_g_error:
+	goto __finally48;
+	__catch48_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"
 	}
-	__finally46:
+	__finally48:
 #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/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index ed7d671..eaf1815 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.32.1, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.34.4, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index 5cfc5a9..1b3292d 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from SourceInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,7 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 /* See the note in MediaInterfaces.vala for some thoughts on the theory of expanding Shotwell's*/
-/* features via interfaces rather than class heirarchies.*/
+/* features via interfaces rather than class hierarchies.*/
 /* Indexable DataSources provide raw strings that may be searched against (and, in the future,*/
 /* indexed) for free-text search queries.  DataSources implementing Indexable must prepare and*/
 /* store (i.e. cache) these strings using prepare_indexable_string(s), as preparing the strings*/
diff --git a/src/core/SourceInterfaces.vala b/src/core/SourceInterfaces.vala
index b1d1aa6..91a8aca 100644
--- a/src/core/SourceInterfaces.vala
+++ b/src/core/SourceInterfaces.vala
@@ -5,7 +5,7 @@
  */
 
 // See the note in MediaInterfaces.vala for some thoughts on the theory of expanding Shotwell's
-// features via interfaces rather than class heirarchies.
+// features via interfaces rather than class hierarchies.
 
 // Indexable DataSources provide raw strings that may be searched against (and, in the future,
 // indexed) for free-text search queries.  DataSources implementing Indexable must prepare and
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index fa66f0e..4a340ab 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.32.1, the Vala compiler
+/* Tracker.c generated by valac 0.34.4, the Vala compiler
  * generated from Tracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index dceff91..fd1e603 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.32.1, the Vala compiler
+/* ViewCollection.c generated by valac 0.34.4, the Vala compiler
  * generated from ViewCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/util.c b/src/core/util.c
index 0088011..e398d67 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.32.1, the Vala compiler
+/* util.c generated by valac 0.34.4, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 1cef36b..68aba6f 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.32.1, the Vala compiler
+/* DataImportJob.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImportJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 8844716..93664d4 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.32.1, the Vala compiler
+/* DataImportSource.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImportSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch214_g_error;
+				goto __catch216_g_error;
 			}
 		}
-		goto __finally214;
-		__catch214_g_error:
+		goto __finally216;
+		__catch216_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"
 		}
-		__finally214:
+		__finally216:
 #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 __catch215_g_error;
+					goto __catch217_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 __finally215;
-			__catch215_g_error:
+			goto __finally217;
+			__catch217_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"
 			}
-			__finally215:
+			__finally217:
 #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 __catch216_g_error;
+				goto __catch218_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally216;
-		__catch216_g_error:
+		goto __finally218;
+		__catch218_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"
 		}
-		__finally216:
+		__finally218:
 #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 __catch217_g_error;
+				goto __catch219_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally217;
-		__catch217_g_error:
+		goto __finally219;
+		__catch219_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"
 		}
-		__finally217:
+		__finally219:
 #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 2a1983e..8902b79 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.32.1, the Vala compiler
+/* DataImports.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@
 void data_imports_init (GError** error);
 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"
+#define RESOURCES_IMPORT "import"
 void data_imports_terminate (void);
 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);
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 8f48c0e..64d9337 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImportsPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index ef4b89a..128ad1c 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsUI.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImportsUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index d1df4f4..790a6df 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseTable.c generated by valac 0.34.4, the Vala compiler
  * generated from DatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -208,7 +208,7 @@ static void database_table_prepare_db (const gchar* filename) {
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (file_db);
 #line 211 "DatabaseTable.c"
-				goto __catch13_g_error;
+				goto __catch15_g_error;
 			}
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp14_ = info;
@@ -241,8 +241,8 @@ static void database_table_prepare_db (const gchar* filename) {
 			_g_object_unref0 (file_db);
 #line 243 "DatabaseTable.c"
 		}
-		goto __finally13;
-		__catch13_g_error:
+		goto __finally15;
+		__catch15_g_error:
 		{
 			GError* e = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -275,7 +275,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			_g_error_free0 (e);
 #line 277 "DatabaseTable.c"
 		}
-		__finally13:
+		__finally15:
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -343,54 +343,54 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	ec = _tmp3_;
-#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	if ((&_vala_errmsg) != NULL) {
 #line 365 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_vala_errmsg = _tmp5_;
 #line 376 "DatabaseTable.c"
 	}
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	result = ec;
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	if (errmsg) {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		*errmsg = _vala_errmsg;
 #line 388 "DatabaseTable.c"
 	} else {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
 #line 392 "DatabaseTable.c"
 	}
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	return result;
 #line 396 "DatabaseTable.c"
 }
@@ -478,7 +478,7 @@ void database_table_init (const gchar* filename) {
 #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (src);
 #line 481 "DatabaseTable.c"
-				goto __catch14_g_error;
+				goto __catch16_g_error;
 			}
 #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp13_ = filename;
@@ -490,8 +490,8 @@ void database_table_init (const gchar* filename) {
 			_g_object_unref0 (src);
 #line 492 "DatabaseTable.c"
 		}
-		goto __finally14;
-		__catch14_g_error:
+		goto __finally16;
+		__catch16_g_error:
 		{
 			GError* _error_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -521,7 +521,7 @@ void database_table_init (const gchar* filename) {
 			_g_error_free0 (_error_);
 #line 523 "DatabaseTable.c"
 		}
-		__finally14:
+		__finally16:
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
diff --git a/src/db/Db.c b/src/db/Db.c
index 9c7e328..4133a36 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.32.1, the Vala compiler
+/* Db.c generated by valac 0.34.4, the Vala compiler
  * generated from Db.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 0e763e9..60feebf 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.32.1, the Vala compiler
+/* EventTable.c generated by valac 0.34.4, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index a2923f7..4cd6830 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.32.1, the Vala compiler
+/* PhotoTable.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5739,7 +5739,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
 #line 5720 "PhotoTable.c"
-			goto __catch15_g_error;
+			goto __catch17_g_error;
 		}
 #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!_tmp6_) {
@@ -5829,7 +5829,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_key_file_unref0 (keyfile);
 #line 5810 "PhotoTable.c"
-						goto __catch15_g_error;
+						goto __catch17_g_error;
 					}
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp24_ = keys;
@@ -5951,7 +5951,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_g_key_file_unref0 (keyfile);
 #line 5932 "PhotoTable.c"
-									goto __catch15_g_error;
+									goto __catch17_g_error;
 								}
 #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp39_ = key_map;
@@ -5999,8 +5999,8 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		return result;
 #line 5979 "PhotoTable.c"
 	}
-	goto __finally15;
-	__catch15_g_error:
+	goto __finally17;
+	__catch17_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp46_ = NULL;
@@ -6016,7 +6016,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_g_error_free0 (err);
 #line 5996 "PhotoTable.c"
 	}
-	__finally15:
+	__finally17:
 #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 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6348,7 +6348,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_key_file_unref0 (keyfile);
 #line 6329 "PhotoTable.c"
-				goto __catch16_g_error;
+				goto __catch18_g_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp4_) {
@@ -6481,8 +6481,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		_g_key_file_unref0 (keyfile);
 #line 6461 "PhotoTable.c"
 	}
-	goto __finally16;
-	__catch16_g_error:
+	goto __finally18;
+	__catch18_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp36_ = NULL;
@@ -6498,7 +6498,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		_g_error_free0 (err);
 #line 6478 "PhotoTable.c"
 	}
-	__finally16:
+	__finally18:
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6604,7 +6604,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
 #line 6585 "PhotoTable.c"
-			goto __catch17_g_error;
+			goto __catch19_g_error;
 		}
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!_tmp4_) {
@@ -6647,7 +6647,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
 #line 6628 "PhotoTable.c"
-			goto __catch17_g_error;
+			goto __catch19_g_error;
 		}
 #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp16_ = keyfile;
@@ -6667,8 +6667,8 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_g_key_file_unref0 (keyfile);
 #line 6647 "PhotoTable.c"
 	}
-	goto __finally17;
-	__catch17_g_error:
+	goto __finally19;
+	__catch19_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -6684,7 +6684,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_g_error_free0 (err);
 #line 6664 "PhotoTable.c"
 	}
-	__finally17:
+	__finally19:
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6900,7 +6900,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp17_ = thumbnail_md5;
+		_tmp17_ = md5;
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
 #line 6885 "PhotoTable.c"
@@ -6909,105 +6909,105 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = sql;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp19_ = g_strconcat (_tmp18_, " thumbnail_md5=?", NULL);
+			_tmp19_ = g_strconcat (_tmp18_, " md5=?", NULL);
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp19_;
 #line 6896 "PhotoTable.c"
 		}
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp20_ = md5;
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		_tmp20_ = thumbnail_md5;
+#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp20_ != NULL) {
 #line 6902 "PhotoTable.c"
 			const gchar* _tmp21_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			_tmp21_ = thumbnail_md5;
-#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+			_tmp21_ = md5;
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp21_ == NULL) {
 #line 6908 "PhotoTable.c"
 				const gchar* _tmp22_ = NULL;
 				gchar* _tmp23_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = sql;
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp23_ = g_strconcat (_tmp22_, " md5=?", NULL);
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+				_tmp23_ = g_strconcat (_tmp22_, " thumbnail_md5=?", NULL);
+#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (sql);
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp23_;
 #line 6919 "PhotoTable.c"
 			} else {
 				const gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = sql;
-#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-				_tmp25_ = g_strconcat (_tmp24_, " OR md5=?", NULL);
-#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+				_tmp25_ = g_strconcat (_tmp24_, " OR (md5 IS NULL AND thumbnail_md5=?)", NULL);
+#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (sql);
-#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp25_;
 #line 6931 "PhotoTable.c"
 			}
 		}
-#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp26_ = sql;
-#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp27_ = g_strconcat (_tmp26_, ")", NULL);
-#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (sql);
-#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp27_;
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp28_ = file_format;
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
 #line 6946 "PhotoTable.c"
 			const gchar* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp29_ = sql;
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL);
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp30_;
 #line 6957 "PhotoTable.c"
 		}
-#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = sql;
-#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp32_ = g_strconcat (_tmp31_, ")", NULL);
-#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (sql);
-#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp32_;
 #line 6967 "PhotoTable.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = database_table_db;
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = sql;
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL);
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp35_;
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp36_;
 #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp36_;
+#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = res;
-#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 944 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 945 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	col = 1;
-#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = file;
-#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
 #line 6991 "PhotoTable.c"
 		sqlite3_stmt* _tmp39_ = NULL;
@@ -7017,31 +7017,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp43_ = NULL;
 		gint _tmp44_ = 0;
 		gint _tmp45_ = 0;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = stmt;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp40_ = col;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp40_ + 1;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp41_ = file;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp42_ = g_file_get_path (_tmp41_);
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp43_ = g_free;
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_);
-#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = _tmp44_;
 #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		res = _tmp44_;
+#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp45_ = res;
-#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK");
 #line 7019 "PhotoTable.c"
 	}
-#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = thumbnail_md5;
-#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
 #line 7025 "PhotoTable.c"
 		sqlite3_stmt* _tmp47_ = NULL;
@@ -7051,31 +7051,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp51_ = NULL;
 		gint _tmp52_ = 0;
 		gint _tmp53_ = 0;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = stmt;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp48_ = col;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp48_ + 1;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp49_ = thumbnail_md5;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp50_ = g_strdup (_tmp49_);
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp51_ = g_free;
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_);
-#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = _tmp52_;
 #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		res = _tmp52_;
+#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp53_ = res;
-#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK");
 #line 7053 "PhotoTable.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = md5;
-#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
 #line 7059 "PhotoTable.c"
 		sqlite3_stmt* _tmp55_ = NULL;
@@ -7085,58 +7085,58 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp59_ = NULL;
 		gint _tmp60_ = 0;
 		gint _tmp61_ = 0;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_ = stmt;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp56_ = col;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp56_ + 1;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp57_ = md5;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp58_ = g_strdup (_tmp57_);
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp59_ = g_free;
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_);
-#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = _tmp60_;
 #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		res = _tmp60_;
+#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp61_ = res;
-#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
 #line 7087 "PhotoTable.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = thumbnail_md5;
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp64_ != NULL) {
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = TRUE;
 #line 7095 "PhotoTable.c"
 	} else {
 		const gchar* _tmp65_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = _tmp65_ != NULL;
 #line 7102 "PhotoTable.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
 #line 7106 "PhotoTable.c"
 		PhotoFileFormat _tmp66_ = 0;
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN;
 #line 7112 "PhotoTable.c"
 	} else {
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = FALSE;
 #line 7116 "PhotoTable.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
 #line 7120 "PhotoTable.c"
 		sqlite3_stmt* _tmp67_ = NULL;
@@ -7145,31 +7145,31 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		gint _tmp70_ = 0;
 		gint _tmp71_ = 0;
 		gint _tmp72_ = 0;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp67_ = stmt;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp68_ = col;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp68_ + 1;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp69_ = file_format;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp70_ = photo_file_format_serialize (_tmp69_);
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_);
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		res = _tmp71_;
 #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		res = _tmp71_;
+#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp72_ = res;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
 #line 7145 "PhotoTable.c"
 	}
-#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = stmt;
-#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (sql);
-#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7153 "PhotoTable.c"
 }
@@ -7187,83 +7187,83 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 	sqlite3_stmt* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = file;
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = thumbnail_md5;
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = md5;
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = file_format;
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	stmt = _tmp4_;
 #line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	stmt = _tmp4_;
+#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_step (_tmp5_);
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 973 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp6_;
-#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 975 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp7_ == SQLITE_DONE) {
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
 #line 7201 "PhotoTable.c"
 	} else {
 		gint _tmp8_ = 0;
-#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
-#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp8_ == SQLITE_ROW) {
-#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = TRUE;
-#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
 #line 7214 "PhotoTable.c"
 		} else {
 			gint _tmp9_ = 0;
-#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = res;
-#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("has_duplicate", _tmp9_);
-#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = FALSE;
-#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
 #line 7227 "PhotoTable.c"
 		}
 	}
-#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 7232 "PhotoTable.c"
 }
 
 
 static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) {
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if ((*length) == (*size)) {
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*array = g_renew (PhotoID, *array, *size);
 #line 7243 "PhotoTable.c"
 	}
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*array)[(*length)++] = *value;
 #line 7247 "PhotoTable.c"
 }
@@ -7286,37 +7286,37 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	gint _tmp7_ = 0;
 	PhotoID* _tmp15_ = NULL;
 	gint _tmp15__length1 = 0;
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = file;
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = thumbnail_md5;
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = md5;
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = file_format;
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 990 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp4_;
-#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = g_new0 (PhotoID, 0);
-#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	ids = _tmp5_;
-#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	ids_length1 = 0;
-#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_ids_size_ = ids_length1;
-#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = stmt;
-#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_step (_tmp6_);
-#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp7_;
 #line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp7_;
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
 #line 7300 "PhotoTable.c"
 		gint _tmp8_ = 0;
@@ -7327,49 +7327,49 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		PhotoID _tmp12_ = {0};
 		sqlite3_stmt* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
-#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
-#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!(_tmp8_ == SQLITE_ROW)) {
-#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
 #line 7315 "PhotoTable.c"
 		}
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = ids;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9__length1 = ids_length1;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = stmt;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = sqlite3_column_int64 (_tmp10_, 0);
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp12_, _tmp11_);
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_);
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		_vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_);
+#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = stmt;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = sqlite3_step (_tmp13_);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp14_;
 #line 7335 "PhotoTable.c"
 	}
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = ids;
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15__length1 = ids_length1;
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (result_length1) {
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result_length1 = _tmp15__length1;
 #line 7345 "PhotoTable.c"
 	}
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp15_;
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7353 "PhotoTable.c"
 }
@@ -7381,47 +7381,47 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 	PhotoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
 #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (photo_id != NULL);
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = backlinks;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
 #line 7371 "PhotoTable.c"
 		const gchar* _tmp2_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
 #line 7377 "PhotoTable.c"
 	} else {
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
 #line 7381 "PhotoTable.c"
 	}
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/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 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7397 "PhotoTable.c"
 		} else {
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/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 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7405 "PhotoTable.c"
 		}
@@ -7438,48 +7438,48 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 	PhotoRow* _tmp5_ = NULL;
 	BackingPhotoID _tmp6_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/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"
-	g_return_if_fail (editable_id != NULL);
 #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (editable_id != NULL);
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->photo_id;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *editable_id;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/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 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7446 "PhotoTable.c"
 		} else {
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/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 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7454 "PhotoTable.c"
 		}
 	}
-#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = row;
-#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = *editable_id;
-#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_->editable_id = _tmp6_;
 #line 7463 "PhotoTable.c"
 }
@@ -7491,40 +7491,40 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 	gint64 _tmp2_ = 0LL;
 	PhotoRow* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
 #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (IS_PHOTO_ROW (row));
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->photo_id;
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/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 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7493 "PhotoTable.c"
 		} else {
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/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 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7501 "PhotoTable.c"
 		}
 	}
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = row;
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID);
 #line 7508 "PhotoTable.c"
 }
@@ -7536,43 +7536,43 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 	PhotoID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (photo_id != NULL);
 #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (photo_id != NULL);
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = dirty;
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_) {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 1;
 #line 7528 "PhotoTable.c"
 	} else {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 0;
 #line 7532 "PhotoTable.c"
 	}
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *photo_id;
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_.id;
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/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 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7548 "PhotoTable.c"
 		} else {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/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 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7556 "PhotoTable.c"
 		}
@@ -7598,124 +7598,124 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	BackingPhotoID _tmp15_ = {0};
 	gint64 _tmp16_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (backing_photo_id != NULL);
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = rd;
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	switch (_tmp0_) {
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_SHOTWELL:
 #line 7592 "PhotoTable.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp1_ = g_strdup ("develop_shotwell_id");
-#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+			col = _tmp1_;
+#line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
 #line 7603 "PhotoTable.c"
 		}
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_CAMERA:
 #line 7607 "PhotoTable.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp2_ = g_strdup ("develop_camera_id");
-#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp2_;
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+			col = _tmp2_;
+#line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
 #line 7618 "PhotoTable.c"
 		}
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_EMBEDDED:
 #line 7622 "PhotoTable.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp3_ = g_strdup ("develop_embedded_id");
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-			col = _tmp3_;
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+			col = _tmp3_;
+#line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
 #line 7633 "PhotoTable.c"
 		}
 		default:
 		{
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_assert_not_reached ();
 #line 7639 "PhotoTable.c"
 		}
 	}
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = row;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = _tmp4_->development_ids;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5__length1 = _tmp4_->development_ids_length1;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = rd;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = *backing_photo_id;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_[_tmp6_] = _tmp7_;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp8_ = _tmp5_[_tmp6_];
 #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp8_ = _tmp5_[_tmp6_];
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = row;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = _tmp9_->photo_id;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = _tmp10_.id;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = col;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = *backing_photo_id;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_.id;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/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 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/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 1045 "/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 1045 "/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 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7680 "PhotoTable.c"
 		} else {
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/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 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7690 "PhotoTable.c"
 		}
 	}
-#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = *backing_photo_id;
-#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_.id;
-#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
 #line 7699 "PhotoTable.c"
 		PhotoRow* _tmp17_ = NULL;
@@ -7724,47 +7724,47 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 		RawDeveloper _tmp20_ = 0;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = row;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp18_ = _tmp17_->photo_id;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp19_ = _tmp18_.id;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = rd;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp21_ = raw_developer_to_string (_tmp20_);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = _tmp21_;
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/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 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp22_);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 7732 "PhotoTable.c"
 			} else {
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/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 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 7742 "PhotoTable.c"
 			}
 		}
 	}
-#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (col);
 #line 7748 "PhotoTable.c"
 }
@@ -7775,33 +7775,33 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 	RawDeveloper _tmp1_ = 0;
 	BackingPhotoID _tmp2_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_PHOTO_ROW (row));
 #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (IS_PHOTO_ROW (row));
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = rd;
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID);
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7777 "PhotoTable.c"
 		} else {
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/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 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 7785 "PhotoTable.c"
 		}
@@ -7846,11 +7846,11 @@ GType photo_table_get_type (void) {
 
 void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 	gint64 _tmp0_ = 0LL;
-#line 1071 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	memset (self, 0, sizeof (BackingPhotoID));
 #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	memset (self, 0, sizeof (BackingPhotoID));
+#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = id;
-#line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
 #line 7834 "PhotoTable.c"
 }
@@ -7859,11 +7859,11 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	gboolean result = FALSE;
 	gint64 _tmp0_ = 0LL;
-#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
-#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp0_ == BACKING_PHOTO_ID_INVALID;
-#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7847 "PhotoTable.c"
 }
@@ -7872,11 +7872,11 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	gboolean result = FALSE;
 	gint64 _tmp0_ = 0LL;
-#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
-#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp0_ != BACKING_PHOTO_ID_INVALID;
-#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7860 "PhotoTable.c"
 }
@@ -7884,18 +7884,18 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) {
 	BackingPhotoID* dup;
-#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	dup = g_new0 (BackingPhotoID, 1);
-#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memcpy (dup, self, sizeof (BackingPhotoID));
-#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
 #line 7872 "PhotoTable.c"
 }
 
 
 void backing_photo_id_free (BackingPhotoID* self) {
-#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
 #line 7879 "PhotoTable.c"
 }
@@ -7921,35 +7921,35 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 	GFileInfo* _tmp4_ = NULL;
 	GTimeVal _tmp5_ = {0};
 	glong _tmp6_ = 0L;
-#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1095 "/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"
-	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
 #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
+#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = self->filesize;
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = info;
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1096 "/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"
-	if (_tmp0_ != _tmp2_) {
 #line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	if (_tmp0_ != _tmp2_) {
+#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
 #line 7919 "PhotoTable.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = info;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1099 "/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 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.tv_sec;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_ == ((time_t) _tmp6_);
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7933 "PhotoTable.c"
 }
@@ -7964,35 +7964,35 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	GFileInfo* _tmp4_ = NULL;
 	GTimeVal _tmp5_ = {0};
 	glong _tmp6_ = 0L;
-#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
-#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
 #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
+#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = self->filesize;
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = info;
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp0_ != _tmp2_) {
 #line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	if (_tmp0_ != _tmp2_) {
+#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
 #line 7962 "PhotoTable.c"
 	}
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = info;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_file_info_get_modification_time (_tmp4_, &_tmp5_);
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.tv_sec;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_ != ((time_t) _tmp6_);
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 7976 "PhotoTable.c"
 }
@@ -8016,61 +8016,61 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from)
 	Dimensions _tmp14_ = {0};
 	BackingPhotoRow* _tmp15_ = NULL;
 	Orientation _tmp16_ = 0;
-#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (self));
-#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (from));
 #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (IS_BACKING_PHOTO_ROW (from));
+#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = from;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->id;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->id = _tmp1_;
 #line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->id = _tmp1_;
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = from;
-#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_->time_created;
-#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->time_created = _tmp3_;
 #line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->time_created = _tmp3_;
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = from;
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = _tmp4_->filepath;
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
-#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->filepath = _tmp6_;
 #line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->filepath = _tmp6_;
+#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = from;
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = _tmp7_->filesize;
-#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->filesize = _tmp8_;
 #line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->filesize = _tmp8_;
+#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = from;
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = _tmp9_->timestamp;
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->timestamp = _tmp10_;
 #line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->timestamp = _tmp10_;
+#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = from;
-#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = _tmp11_->file_format;
-#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->file_format = _tmp12_;
 #line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->file_format = _tmp12_;
+#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = from;
-#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->dim;
-#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self->dim = _tmp14_;
 #line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self->dim = _tmp14_;
+#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = from;
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_->original_orientation;
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->original_orientation = _tmp16_;
 #line 8054 "PhotoTable.c"
 }
@@ -8078,32 +8078,32 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from)
 
 BackingPhotoRow* backing_photo_row_construct (GType object_type) {
 	BackingPhotoRow* self = NULL;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (BackingPhotoRow*) g_type_create_instance (object_type);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
 #line 8064 "PhotoTable.c"
 }
 
 
 BackingPhotoRow* backing_photo_row_new (void) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW);
 #line 8071 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_init (GValue* value) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	value->data[0].v_pointer = NULL;
 #line 8078 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_free_value (GValue* value) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (value->data[0].v_pointer) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (value->data[0].v_pointer);
 #line 8087 "PhotoTable.c"
 	}
@@ -8111,13 +8111,13 @@ static void value_backing_photo_row_free_value (GValue* value) {
 
 
 static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 8097 "PhotoTable.c"
 	} else {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 8101 "PhotoTable.c"
 	}
@@ -8125,37 +8125,37 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue*
 
 
 static gpointer value_backing_photo_row_peek_pointer (const GValue* value) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
 #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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
 #line 8116 "PhotoTable.c"
 		BackingPhotoRow* object;
 		object = collect_values[0].v_pointer;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 8123 "PhotoTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 8127 "PhotoTable.c"
 		}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = backing_photo_row_ref (object);
 #line 8131 "PhotoTable.c"
 	} else {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
 #line 8135 "PhotoTable.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
 #line 8139 "PhotoTable.c"
 }
@@ -8164,27 +8164,27 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll
 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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 8150 "PhotoTable.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!value->data[0].v_pointer) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = NULL;
 #line 8156 "PhotoTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = value->data[0].v_pointer;
 #line 8160 "PhotoTable.c"
 	} else {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = backing_photo_row_ref (value->data[0].v_pointer);
 #line 8164 "PhotoTable.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
 #line 8168 "PhotoTable.c"
 }
@@ -8192,22 +8192,22 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_
 
 GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBackingPhotoRow* spec;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return G_PARAM_SPEC (spec);
 #line 8182 "PhotoTable.c"
 }
 
 
 gpointer value_get_backing_photo_row (const GValue* value) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
 #line 8191 "PhotoTable.c"
 }
@@ -8215,29 +8215,29 @@ gpointer value_get_backing_photo_row (const GValue* value) {
 
 void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 	BackingPhotoRow* old;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	old = value->data[0].v_pointer;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (v_object) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_ref (value->data[0].v_pointer);
 #line 8211 "PhotoTable.c"
 	} else {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
 #line 8215 "PhotoTable.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
 #line 8221 "PhotoTable.c"
 	}
@@ -8246,27 +8246,27 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 
 void value_take_backing_photo_row (GValue* value, gpointer v_object) {
 	BackingPhotoRow* old;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	old = value->data[0].v_pointer;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (v_object) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
 #line 8240 "PhotoTable.c"
 	} else {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
 #line 8244 "PhotoTable.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
 #line 8250 "PhotoTable.c"
 	}
@@ -8274,18 +8274,18 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) {
 
 
 static void backing_photo_row_class_init (BackingPhotoRowClass * klass) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_row_parent_class = g_type_class_peek_parent (klass);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize;
 #line 8260 "PhotoTable.c"
 }
 
 
 static void backing_photo_row_instance_init (BackingPhotoRow * self) {
-#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->filepath = NULL;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->ref_count = 1;
 #line 8269 "PhotoTable.c"
 }
@@ -8293,11 +8293,11 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) {
 
 static void backing_photo_row_finalize (BackingPhotoRow* obj) {
 	BackingPhotoRow * self;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_signal_handlers_destroy (self);
-#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
 #line 8281 "PhotoTable.c"
 }
@@ -8320,9 +8320,9 @@ GType backing_photo_row_get_type (void) {
 gpointer backing_photo_row_ref (gpointer instance) {
 	BackingPhotoRow* self;
 	self = instance;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return instance;
 #line 8306 "PhotoTable.c"
 }
@@ -8331,11 +8331,11 @@ gpointer backing_photo_row_ref (gpointer instance) {
 void backing_photo_row_unref (gpointer instance) {
 	BackingPhotoRow* self;
 	self = instance;
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self);
-#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 8319 "PhotoTable.c"
 	}
@@ -8353,52 +8353,52 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	sqlite3_stmt* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
-#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	self = (BackingPhotoTable*) database_table_construct (object_type);
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	self = (BackingPhotoTable*) database_table_construct (object_type);
+#line 1126 "/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 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1129 "/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 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1129 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = sqlite3_step (_tmp4_);
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp5_;
 #line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp5_;
+#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = res;
-#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
 #line 8363 "PhotoTable.c"
 		gint _tmp7_ = 0;
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create PhotoBackingTable", _tmp7_);
 #line 8369 "PhotoTable.c"
 	}
-#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
 #line 8375 "PhotoTable.c"
 }
 
 
 static BackingPhotoTable* backing_photo_table_new (void) {
-#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE);
 #line 8382 "PhotoTable.c"
 }
@@ -8409,27 +8409,27 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	BackingPhotoTable* _tmp0_ = NULL;
 	BackingPhotoTable* _tmp2_ = NULL;
 	BackingPhotoTable* _tmp3_ = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = backing_photo_table_instance;
-#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
 #line 8395 "PhotoTable.c"
 		BackingPhotoTable* _tmp1_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = backing_photo_table_new ();
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_database_table_unref0 (backing_photo_table_instance);
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_table_instance = _tmp1_;
 #line 8403 "PhotoTable.c"
 	}
-#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = backing_photo_table_instance;
-#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 8413 "PhotoTable.c"
 }
@@ -8497,203 +8497,203 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	BackingPhotoRow* _tmp56_ = NULL;
 	time_t _tmp57_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (state));
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1158 "/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 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = now_sec ();
-#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	time_created = (time_t) _tmp4_;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = state;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = _tmp6_->filepath;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = g_free;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_);
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp10_;
 #line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp10_;
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = state;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->timestamp;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_);
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp15_;
 #line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp15_;
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = res;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = stmt;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = state;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = _tmp18_->filesize;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_);
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp20_;
 #line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp20_;
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = res;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = stmt;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = state;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = _tmp23_->dim;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = _tmp24_.width;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_);
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp26_;
 #line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp26_;
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = res;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = stmt;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = state;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = _tmp29_->dim;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = _tmp30_.height;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_);
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp32_;
 #line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp32_;
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = res;
-#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = stmt;
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = state;
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = _tmp35_->original_orientation;
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_);
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp37_;
 #line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp37_;
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = res;
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = stmt;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = state;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = _tmp40_->file_format;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = photo_file_format_serialize (_tmp41_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp43_;
 #line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp43_;
+#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = res;
-#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = stmt;
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = time_created;
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_);
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp47_;
 #line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp47_;
+#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = res;
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = stmt;
-#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = sqlite3_step (_tmp49_);
-#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp50_;
 #line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp50_;
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = res;
-#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
 #line 8631 "PhotoTable.c"
 		gint _tmp52_ = 0;
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 8647 "PhotoTable.c"
 			} else {
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/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 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 8657 "PhotoTable.c"
 			}
 		}
 	}
-#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = state;
-#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = database_table_db;
-#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = sqlite3_last_insert_rowid (_tmp54_);
-#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	backing_photo_id_init (&_tmp53_->id, _tmp55_);
 #line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	backing_photo_id_init (&_tmp53_->id, _tmp55_);
+#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = state;
-#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = time_created;
-#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_->time_created = _tmp57_;
-#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 8677 "PhotoTable.c"
 }
@@ -8745,174 +8745,174 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	sqlite3_stmt* _tmp40_ = NULL;
 	gint64 _tmp41_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL);
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1194 "/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 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *id;
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp7_;
 #line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp7_;
+#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_step (_tmp9_);
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp10_;
 #line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp10_;
+#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	if (_tmp11_ == SQLITE_DONE) {
 #line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	if (_tmp11_ == SQLITE_DONE) {
+#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
 #line 8775 "PhotoTable.c"
 	} else {
 		gint _tmp12_ = 0;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
 #line 8782 "PhotoTable.c"
 			gint _tmp13_ = 0;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
 #line 8798 "PhotoTable.c"
 				} else {
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/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 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_clear_error (&_inner_error_);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
 #line 8808 "PhotoTable.c"
 				}
 			}
 		}
 	}
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = backing_photo_row_new ();
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	row = _tmp14_;
 #line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	row = _tmp14_;
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = row;
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = *id;
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp15_->id = _tmp16_;
 #line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp15_->id = _tmp16_;
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = row;
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = stmt;
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = sqlite3_column_text (_tmp18_, 0);
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = g_strdup (_tmp19_);
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp17_->filepath);
-#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp17_->filepath = _tmp20_;
 #line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp17_->filepath = _tmp20_;
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = row;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = stmt;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = sqlite3_column_int64 (_tmp22_, 1);
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_->timestamp = (time_t) _tmp23_;
 #line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp21_->timestamp = (time_t) _tmp23_;
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = row;
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = stmt;
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = sqlite3_column_int64 (_tmp25_, 2);
-#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp24_->filesize = _tmp26_;
 #line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp24_->filesize = _tmp26_;
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = row;
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = stmt;
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_column_int (_tmp28_, 3);
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = stmt;
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = sqlite3_column_int (_tmp30_, 4);
-#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_);
 #line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_);
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = row;
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = stmt;
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = sqlite3_column_int (_tmp33_, 5);
-#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp32_->original_orientation = (Orientation) _tmp34_;
 #line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp32_->original_orientation = (Orientation) _tmp34_;
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = row;
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = stmt;
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_column_int (_tmp36_, 6);
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = photo_file_format_unserialize (_tmp37_);
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp35_->file_format = _tmp38_;
 #line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp35_->file_format = _tmp38_;
+#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = row;
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = stmt;
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = sqlite3_column_int64 (_tmp40_, 7);
-#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_->time_created = (time_t) _tmp41_;
-#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = row;
-#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
 #line 8895 "PhotoTable.c"
 }
@@ -8968,171 +8968,171 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 	gint _tmp44_ = 0;
 	gint _tmp45_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (row));
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1224 "/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 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = row;
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_->timestamp;
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_);
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp7_;
 #line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp7_;
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = row;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = _tmp10_->filesize;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_);
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp12_;
 #line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp12_;
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = res;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = stmt;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = row;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_->dim;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = _tmp16_.width;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_);
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp18_;
 #line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp18_;
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = res;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = stmt;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = row;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = _tmp21_->dim;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = _tmp22_.height;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_);
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp24_;
 #line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp24_;
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = res;
-#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = stmt;
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = row;
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = _tmp27_->original_orientation;
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_);
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp29_;
 #line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp29_;
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = res;
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = stmt;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = row;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = _tmp32_->file_format;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = photo_file_format_serialize (_tmp33_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp35_;
 #line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp35_;
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = res;
-#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = stmt;
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = row;
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = _tmp38_->id;
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = _tmp39_.id;
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_);
-#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp41_;
 #line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp41_;
+#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = res;
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = stmt;
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = sqlite3_step (_tmp43_);
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp44_;
 #line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp44_;
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = res;
-#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
 #line 9083 "PhotoTable.c"
 		gint _tmp46_ = 0;
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 9099 "PhotoTable.c"
 			} else {
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/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 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 9109 "PhotoTable.c"
 			}
 		}
 	}
-#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 9115 "PhotoTable.c"
 }
@@ -9162,103 +9162,103 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (id != NULL);
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=? WHERE id=?", -1, &_tmp1_, NULL);
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = timestamp;
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_);
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp6_;
 #line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp6_;
+#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = stmt;
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = filesize;
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp10_;
 #line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp10_;
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
 #line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = *id;
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_.id;
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_);
-#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp15_;
 #line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp15_;
+#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = res;
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = stmt;
-#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = sqlite3_step (_tmp17_);
-#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp18_;
 #line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp18_;
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = res;
-#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
 #line 9209 "PhotoTable.c"
 		gint _tmp20_ = 0;
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 9225 "PhotoTable.c"
 			} else {
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/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 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
 #line 9235 "PhotoTable.c"
 			}
 		}
 	}
-#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 9241 "PhotoTable.c"
 }
@@ -9268,31 +9268,31 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 	BackingPhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (backing_id != NULL);
 #line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (backing_id != NULL);
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *backing_id;
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/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 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9267 "PhotoTable.c"
 		} else {
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/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 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9275 "PhotoTable.c"
 		}
@@ -9305,35 +9305,35 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 	gint64 _tmp1_ = 0LL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (id != NULL);
-#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (filepath != NULL);
 #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (filepath != NULL);
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *id;
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = filepath;
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/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 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9308 "PhotoTable.c"
 		} else {
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/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 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9316 "PhotoTable.c"
 		}
@@ -9346,33 +9346,33 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 	gint64 _tmp1_ = 0LL;
 	time_t _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	g_return_if_fail (id != NULL);
 #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	g_return_if_fail (id != NULL);
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *id;
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = timestamp;
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/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 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9347 "PhotoTable.c"
 		} else {
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/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 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
 #line 9355 "PhotoTable.c"
 		}
@@ -9381,9 +9381,9 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 
 
 static void backing_photo_table_class_init (BackingPhotoTableClass * klass) {
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_table_parent_class = g_type_class_peek_parent (klass);
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize;
 #line 9366 "PhotoTable.c"
 }
@@ -9395,9 +9395,9 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) {
 
 static void backing_photo_table_finalize (DatabaseTable* obj) {
 	BackingPhotoTable * self;
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj);
 #line 9380 "PhotoTable.c"
 }
diff --git a/src/db/PhotoTable.vala b/src/db/PhotoTable.vala
index 4304da8..24cec86 100644
--- a/src/db/PhotoTable.vala
+++ b/src/db/PhotoTable.vala
@@ -920,14 +920,15 @@ public class PhotoTable : DatabaseTable {
                 sql += " OR ((";
             first = false;
             
-            if (thumbnail_md5 != null)
-                sql += " thumbnail_md5=?";
-            
             if (md5 != null) {
-                if (thumbnail_md5 == null)
-                    sql += " md5=?";
+                sql += " md5=?";
+
+            }
+            if (thumbnail_md5 != null) {
+                if (md5 == null)
+                    sql += " thumbnail_md5=?";
                 else
-                    sql += " OR md5=?";
+                    sql += " OR (md5 IS NULL AND thumbnail_md5=?)";
             }
             
             sql += ")";
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 1747d47..f0c850f 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.34.4, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index 1c58788..1e38ccd 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.32.1, the Vala compiler
+/* TagTable.c generated by valac 0.34.4, the Vala compiler
  * generated from TagTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 655 "TagTable.c"
 	{
@@ -664,98 +664,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 686 "TagTable.c"
-				goto __catch19_g_regex_error;
+				goto __catch21_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 695 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 711 "TagTable.c"
-				goto __catch19_g_regex_error;
+				goto __catch21_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 722 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 736 "TagTable.c"
 	}
-	goto __finally19;
-	__catch19_g_regex_error:
+	goto __finally21;
+	__catch21_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 750 "TagTable.c"
 	}
-	__finally19:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally21:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 761 "TagTable.c"
 	}
@@ -786,7 +786,7 @@ void tag_table_upgrade_for_htags (void) {
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 789 "TagTable.c"
-				goto __catch18_database_error;
+				goto __catch20_database_error;
 			}
 #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 			_database_table_unref0 (table);
@@ -899,7 +899,7 @@ void tag_table_upgrade_for_htags (void) {
 #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 902 "TagTable.c"
-						goto __catch18_database_error;
+						goto __catch20_database_error;
 					}
 #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 					_tag_row_unref0 (row);
@@ -929,8 +929,8 @@ void tag_table_upgrade_for_htags (void) {
 		_g_object_unref0 (rows);
 #line 931 "TagTable.c"
 	}
-	goto __finally18;
-	__catch18_database_error:
+	goto __finally20;
+	__catch20_database_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp23_ = NULL;
@@ -947,7 +947,7 @@ void tag_table_upgrade_for_htags (void) {
 		_g_error_free0 (e);
 #line 948 "TagTable.c"
 	}
-	__finally18:
+	__finally20:
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala"
@@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2025 "TagTable.c"
 }
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index 542e568..7829600 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.32.1, the Vala compiler
+/* TombstoneTable.c generated by valac 0.34.4, the Vala compiler
  * generated from TombstoneTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index fa79d52..895d2ad 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.32.1, the Vala compiler
+/* VersionTable.c generated by valac 0.34.4, the Vala compiler
  * generated from VersionTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index 8b8d78a..39adf72 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.32.1, the Vala compiler
+/* VideoTable.c generated by valac 0.34.4, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 2e1bfa4..3f0abf5 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.32.1, the Vala compiler
+/* Direct.c generated by valac 0.34.4, the Vala compiler
  * generated from Direct.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 97ebcd5..6e17fe2 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.32.1, the Vala compiler
+/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch42_g_error;
+			goto __catch44_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 __finally42;
-	__catch42_g_error:
+	goto __finally44;
+	__catch44_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"
 	}
-	__finally42:
+	__finally44:
 #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 __catch43_g_error;
+			goto __catch45_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 __catch43_g_error;
+			goto __catch45_g_error;
 		}
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally45;
+	__catch45_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"
 	}
-	__finally43:
+	__finally45:
 #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 __catch44_g_error;
+					goto __catch46_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 __catch44_g_error;
+						goto __catch46_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 __finally44;
-			__catch44_g_error:
+			goto __finally46;
+			__catch46_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"
 			}
-			__finally44:
+			__finally46:
 #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"
@@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->file_map = _tmp1_;
 #line 2798 "DirectPhoto.c"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 807c74b..aeefa98 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.32.1, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.34.4, the Vala compiler
  * generated from DirectPhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,11 +12,11 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <float.h>
@@ -265,16 +265,6 @@ 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 ())
@@ -349,6 +339,16 @@ 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))
@@ -392,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -711,10 +712,10 @@ 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 void direct_photo_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -819,6 +820,8 @@ 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);
@@ -839,9 +842,9 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
 static Block6Data* block6_data_ref (Block6Data* _data6_);
 static void block6_data_unref (void * _userdata_);
-static gboolean __lambda14_ (Block6Data* _data6_);
+static gboolean __lambda15_ (Block6Data* _data6_);
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
-static gboolean ___lambda14__gsource_func (gpointer self);
+static gboolean ___lambda15__gsource_func (gpointer self);
 static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source);
 static void direct_photo_page_finalize (GObject* obj);
 GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
@@ -859,182 +862,182 @@ static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_phot
 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 863 "DirectPhotoPage.c"
+#line 866 "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"
+#line 873 "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"
+#line 880 "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"
+#line 887 "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"
+#line 894 "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"
+#line 901 "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"
+#line 908 "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"
+#line 915 "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"
+#line 922 "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"
+#line 929 "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"
+#line 936 "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"
+#line 943 "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"
+#line 950 "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"
+#line 957 "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"
+#line 964 "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"
+#line 971 "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"
+#line 978 "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"
+#line 985 "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"
+#line 992 "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"
+#line 999 "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"
+#line 1006 "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"
+#line 1013 "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"
+#line 1020 "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"
+#line 1027 "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 1031 "DirectPhotoPage.c"
+#line 1034 "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 1038 "DirectPhotoPage.c"
+#line 1041 "DirectPhotoPage.c"
 }
 
 
@@ -1074,7 +1077,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 1078 "DirectPhotoPage.c"
+#line 1081 "DirectPhotoPage.c"
 		Application* _tmp6_ = NULL;
 		Application* _tmp7_ = NULL;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1087,7 +1090,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 1091 "DirectPhotoPage.c"
+#line 1094 "DirectPhotoPage.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = file;
@@ -1125,14 +1128,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 1129 "DirectPhotoPage.c"
+#line 1132 "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 1136 "DirectPhotoPage.c"
+#line 1139 "DirectPhotoPage.c"
 }
 
 
@@ -1157,68 +1160,115 @@ 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 1161 "DirectPhotoPage.c"
+#line 1164 "DirectPhotoPage.c"
 }
 
 
-static void direct_photo_page_real_add_actions (Page* base) {
+static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	DirectPhotoPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
+#line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	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_;
+	_tmp0_ = map;
+#line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	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), _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);
+	_tmp1_ = map;
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 1181 "DirectPhotoPage.c"
+	g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
+#line 1184 "DirectPhotoPage.c"
+}
+
+
+static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) {
+	DirectPhotoPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = map;
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
+#line 1199 "DirectPhotoPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		entry_collection = DIRECT_PHOTO_PAGE_entries;
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries);
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
+#line 1211 "DirectPhotoPage.c"
+			GActionEntry entry = {0};
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+			entry = entry_collection[entry_it];
+#line 1215 "DirectPhotoPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+				_tmp1_ = map;
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+				_tmp2_ = entry;
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1228 "DirectPhotoPage.c"
+			}
+		}
+	}
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 1188 "DirectPhotoPage.c"
+#line 1238 "DirectPhotoPage.c"
 }
 
 
 static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1199 "DirectPhotoPage.c"
+#line 1249 "DirectPhotoPage.c"
 	}
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1205 "DirectPhotoPage.c"
+#line 1255 "DirectPhotoPage.c"
 }
 
 
 static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1216 "DirectPhotoPage.c"
+#line 1266 "DirectPhotoPage.c"
 	}
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1222 "DirectPhotoPage.c"
+#line 1272 "DirectPhotoPage.c"
 }
 
 
@@ -1244,67 +1294,67 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	InjectionGroup* _tmp9_ = NULL;
 	InjectionGroup** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 82 "/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 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	groups = _tmp1_;
-#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = injection_group_new ("PrintPlaceholder");
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	print_group = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _ ("_Print");
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/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"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = groups;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = _injection_group_ref0 (print_group);
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/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"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = injection_group_new ("SetBackgroundPlaceholder");
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	bg_group = _tmp6_;
-#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = _ ("Set as _Desktop Background");
-#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", "<Primary>b");
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = groups;
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = _injection_group_ref0 (bg_group);
-#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/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"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = groups;
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10__length1 = groups_length1;
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (result_length1) {
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*result_length1 = _tmp10__length1;
-#line 1298 "DirectPhotoPage.c"
+#line 1348 "DirectPhotoPage.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp10_;
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1308 "DirectPhotoPage.c"
+#line 1358 "DirectPhotoPage.c"
 }
 
 
@@ -1315,143 +1365,143 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS);
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp4_) {
-#line 1335 "DirectPhotoPage.c"
+#line 1385 "DirectPhotoPage.c"
 		const gchar* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _ ("%s does not exist.");
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = file;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp10_);
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp8_);
-#line 1360 "DirectPhotoPage.c"
+#line 1410 "DirectPhotoPage.c"
 	} else {
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = file;
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _tmp12_;
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = g_file_test (_tmp13_, G_FILE_TEST_IS_REGULAR);
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = !_tmp14_;
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp13_);
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp15_) {
-#line 1381 "DirectPhotoPage.c"
+#line 1431 "DirectPhotoPage.c"
 			const gchar* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp16_ = _ ("%s is not a file.");
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp17_ = file;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp18_ = g_file_get_path (_tmp17_);
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp19_ = _tmp18_;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp20_ = g_strdup_printf (_tmp16_, _tmp19_);
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp21_ = _tmp20_;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			app_window_error_message (_tmp21_, NULL);
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp21_);
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp19_);
-#line 1406 "DirectPhotoPage.c"
+#line 1456 "DirectPhotoPage.c"
 		} else {
 			GFile* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp22_ = file;
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp23_ = photo_file_format_is_file_supported (_tmp22_);
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (!_tmp23_) {
-#line 1416 "DirectPhotoPage.c"
+#line 1466 "DirectPhotoPage.c"
 				const gchar* _tmp24_ = NULL;
 				GFile* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
 				gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp24_ = _ ("%s does not support the file format of\n%s.");
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp25_ = file;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = g_file_get_path (_tmp25_);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = _tmp26_;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = g_strdup_printf (_tmp24_, RESOURCES_APP_TITLE, _tmp27_);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = _tmp28_;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				app_window_error_message (_tmp29_, NULL);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp29_);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp27_);
-#line 1441 "DirectPhotoPage.c"
+#line 1491 "DirectPhotoPage.c"
 			} else {
-#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = TRUE;
-#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 1447 "DirectPhotoPage.c"
+#line 1497 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1455 "DirectPhotoPage.c"
+#line 1505 "DirectPhotoPage.c"
 }
 
 
@@ -1462,36 +1512,36 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	GFile* _tmp1_ = NULL;
 	DirectPhoto* _tmp2_ = NULL;
 	DirectPhoto* _tmp3_ = NULL;
-#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 105 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/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 1472 "DirectPhotoPage.c"
+#line 1522 "DirectPhotoPage.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = direct_photo_global;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = self->priv->initial_file;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_source_collection_get_file_source (_tmp0_, _tmp1_);
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = photo;
-#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1486 "DirectPhotoPage.c"
+#line 1536 "DirectPhotoPage.c"
 		DirectViewCollection* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = self->priv->view_controller;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = photo;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 118 "/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 1495 "DirectPhotoPage.c"
+#line 1545 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1499,40 +1549,40 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _ ("Unable open photo %s. Sorry.");
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = self->priv->initial_file;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_panic (_tmp11_);
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp11_);
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp9_);
-#line 1521 "DirectPhotoPage.c"
+#line 1571 "DirectPhotoPage.c"
 	}
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->initial_file);
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->initial_file = NULL;
-#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1529 "DirectPhotoPage.c"
+#line 1579 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 1536 "DirectPhotoPage.c"
+#line 1586 "DirectPhotoPage.c"
 }
 
 
@@ -1546,81 +1596,81 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	Photo* _tmp9_ = NULL;
 	DirectPhoto* _tmp10_ = NULL;
 	DirectPhoto* _tmp11_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/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 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_) {
-#line 1564 "DirectPhotoPage.c"
+#line 1614 "DirectPhotoPage.c"
 		DirectPhoto* tmp = NULL;
 		Photo* _tmp3_ = NULL;
 		DirectPhoto* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/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 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp3_) : NULL;
-#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 1577 "DirectPhotoPage.c"
+#line 1627 "DirectPhotoPage.c"
 		}
-#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		tmp = _tmp4_;
-#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = tmp;
-#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 1585 "DirectPhotoPage.c"
+#line 1635 "DirectPhotoPage.c"
 			DirectPhoto* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = tmp;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 131 "/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 1594 "DirectPhotoPage.c"
+#line 1644 "DirectPhotoPage.c"
 		}
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp);
-#line 1598 "DirectPhotoPage.c"
+#line 1648 "DirectPhotoPage.c"
 	}
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = new_photo;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = new_photo;
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 137 "/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 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	tmp = _tmp10_;
-#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = tmp;
-#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_ != NULL) {
-#line 1614 "DirectPhotoPage.c"
+#line 1664 "DirectPhotoPage.c"
 		DirectPhoto* _tmp12_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = tmp;
-#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 140 "/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 1620 "DirectPhotoPage.c"
+#line 1670 "DirectPhotoPage.c"
 	}
-#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp);
-#line 1624 "DirectPhotoPage.c"
+#line 1674 "DirectPhotoPage.c"
 }
 
 
@@ -1630,38 +1680,38 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/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 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1650 "DirectPhotoPage.c"
+#line 1700 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
-#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1665 "DirectPhotoPage.c"
+#line 1715 "DirectPhotoPage.c"
 }
 
 
@@ -1672,73 +1722,73 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/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 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 1684 "DirectPhotoPage.c"
+#line 1734 "DirectPhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/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 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 1690 "DirectPhotoPage.c"
+#line 1740 "DirectPhotoPage.c"
 	} else {
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 1694 "DirectPhotoPage.c"
+#line 1744 "DirectPhotoPage.c"
 	}
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/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 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 1704 "DirectPhotoPage.c"
+#line 1754 "DirectPhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/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 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 1710 "DirectPhotoPage.c"
+#line 1760 "DirectPhotoPage.c"
 	} else {
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 1714 "DirectPhotoPage.c"
+#line 1764 "DirectPhotoPage.c"
 	}
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 1718 "DirectPhotoPage.c"
+#line 1768 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 154 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 161 "/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 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1730 "DirectPhotoPage.c"
+#line 1780 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 159 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/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 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1742 "DirectPhotoPage.c"
+#line 1792 "DirectPhotoPage.c"
 }
 
 
@@ -1752,24 +1802,24 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	contains = FALSE;
-#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 174 "/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 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 1766 "DirectPhotoPage.c"
+#line 1816 "DirectPhotoPage.c"
 		Photo* photo = NULL;
 		Photo* _tmp1_ = NULL;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 175 "/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 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo = _tmp1_;
-#line 1773 "DirectPhotoPage.c"
+#line 1823 "DirectPhotoPage.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeMap* _tmp2_ = NULL;
@@ -1778,25 +1828,25 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 			GeeSet* _tmp5_ = NULL;
 			GeeIterator* _tmp6_ = NULL;
 			GeeIterator* _tmp7_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp2_ = map;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp3_ = gee_map_get_keys (_tmp2_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp4_ = _tmp3_;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp5_ = _tmp4_;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_object_it = _tmp7_;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			while (TRUE) {
-#line 1800 "DirectPhotoPage.c"
+#line 1850 "DirectPhotoPage.c"
 				GeeIterator* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
 				DataObject* object = NULL;
@@ -1804,129 +1854,129 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 				gpointer _tmp11_ = NULL;
 				DataObject* _tmp12_ = NULL;
 				Photo* _tmp13_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp8_ = _object_it;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp9_ = gee_iterator_next (_tmp8_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (!_tmp9_) {
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1816 "DirectPhotoPage.c"
+#line 1866 "DirectPhotoPage.c"
 				}
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp10_ = _object_it;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp11_ = gee_iterator_get (_tmp10_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				object = (DataObject*) _tmp11_;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp12_ = object;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp13_ = photo;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) {
-#line 171 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					contains = TRUE;
-#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					_g_object_unref0 (object);
-#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1836 "DirectPhotoPage.c"
+#line 1886 "DirectPhotoPage.c"
 				}
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (object);
-#line 1840 "DirectPhotoPage.c"
+#line 1890 "DirectPhotoPage.c"
 			}
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_object_it);
-#line 1844 "DirectPhotoPage.c"
+#line 1894 "DirectPhotoPage.c"
 		}
-#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1848 "DirectPhotoPage.c"
+#line 1898 "DirectPhotoPage.c"
 	}
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/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 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp15_) {
-#line 1854 "DirectPhotoPage.c"
+#line 1904 "DirectPhotoPage.c"
 		gboolean _tmp16_ = FALSE;
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/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 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = !_tmp16_;
-#line 1860 "DirectPhotoPage.c"
+#line 1910 "DirectPhotoPage.c"
 	} else {
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 1864 "DirectPhotoPage.c"
+#line 1914 "DirectPhotoPage.c"
 	}
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitive = _tmp14_;
-#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitive;
-#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp17_) {
-#line 1872 "DirectPhotoPage.c"
+#line 1922 "DirectPhotoPage.c"
 		gboolean _tmp18_ = FALSE;
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = contains;
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		sensitive = _tmp18_;
-#line 1878 "DirectPhotoPage.c"
+#line 1928 "DirectPhotoPage.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitive;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp20_) {
-#line 1884 "DirectPhotoPage.c"
+#line 1934 "DirectPhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		PhotoFileFormat _tmp23_ = 0;
 		gboolean _tmp24_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/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 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp23_ = photo_get_file_format (_tmp22_);
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp24_ = photo_file_format_can_write (_tmp23_);
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = _tmp24_;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1901 "DirectPhotoPage.c"
+#line 1951 "DirectPhotoPage.c"
 	} else {
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = FALSE;
-#line 1905 "DirectPhotoPage.c"
+#line 1955 "DirectPhotoPage.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
-#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitive;
-#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 1913 "DirectPhotoPage.c"
+#line 1963 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
 #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
+#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	command_manager_reset (_tmp1_);
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 1930 "DirectPhotoPage.c"
+#line 1980 "DirectPhotoPage.c"
 }
 
 
@@ -1939,51 +1989,51 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	FullscreenWindow* _tmp2_ = NULL;
 	GdkEventButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1955 "DirectPhotoPage.c"
+#line 2005 "DirectPhotoPage.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	fs = _tmp1_;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = fs;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 1963 "DirectPhotoPage.c"
+#line 2013 "DirectPhotoPage.c"
 		FullscreenWindow* _tmp3_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = fs;
-#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (fs);
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 1975 "DirectPhotoPage.c"
+#line 2025 "DirectPhotoPage.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = event;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/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 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp5_;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1987 "DirectPhotoPage.c"
+#line 2037 "DirectPhotoPage.c"
 }
 
 
@@ -2019,135 +2069,135 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	gboolean _tmp26_ = FALSE;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp29_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = missing;
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = sensitivity;
-#line 210 "/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), "Save", _tmp1_);
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = sensitivity;
-#line 211 "/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), "SaveAs", _tmp2_);
-#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = sensitivity;
-#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_);
-#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = sensitivity;
-#line 213 "/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), "Publish", _tmp4_);
-#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = sensitivity;
-#line 214 "/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), "Print", _tmp5_);
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = sensitivity;
-#line 215 "/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), "CommonJumpToFile", _tmp6_);
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = sensitivity;
-#line 217 "/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), "CommonUndo", _tmp7_);
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = sensitivity;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_);
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = sensitivity;
-#line 220 "/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), "IncreaseSize", _tmp9_);
-#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = sensitivity;
-#line 221 "/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), "DecreaseSize", _tmp10_);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = sensitivity;
-#line 222 "/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), "ZoomFit", _tmp11_);
-#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = sensitivity;
-#line 223 "/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), "Zoom100", _tmp12_);
-#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = sensitivity;
-#line 224 "/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), "Zoom200", _tmp13_);
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = sensitivity;
-#line 226 "/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), "RotateClockwise", _tmp14_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = sensitivity;
-#line 227 "/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), "RotateCounterclockwise", _tmp15_);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = sensitivity;
-#line 228 "/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), "FlipHorizontally", _tmp16_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitivity;
-#line 229 "/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), "FlipVertically", _tmp17_);
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = sensitivity;
-#line 230 "/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), "Enhance", _tmp18_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = sensitivity;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_);
-#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitivity;
-#line 232 "/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), "Straighten", _tmp20_);
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = sensitivity;
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_);
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = sensitivity;
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_);
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = sensitivity;
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_);
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = sensitivity;
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_);
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitivity;
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_);
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/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 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp27_) {
-#line 2133 "DirectPhotoPage.c"
+#line 2183 "DirectPhotoPage.c"
 		gboolean _tmp28_ = FALSE;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/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 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = !_tmp28_;
-#line 2139 "DirectPhotoPage.c"
+#line 2189 "DirectPhotoPage.c"
 	} else {
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 2143 "DirectPhotoPage.c"
+#line 2193 "DirectPhotoPage.c"
 	}
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = missing;
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/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 2151 "DirectPhotoPage.c"
+#line 2201 "DirectPhotoPage.c"
 }
 
 
@@ -2182,157 +2232,157 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	gboolean _tmp42_ = FALSE;
 	gint _tmp46_ = 0;
 	gint _tmp47_ = 0;
-#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	multiple = _tmp3_;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/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 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 2204 "DirectPhotoPage.c"
+#line 2254 "DirectPhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/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 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_has_transformations (_tmp8_);
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp10_) {
-#line 2222 "DirectPhotoPage.c"
+#line 2272 "DirectPhotoPage.c"
 			gboolean _tmp11_ = FALSE;
-#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/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 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = !_tmp11_;
-#line 2228 "DirectPhotoPage.c"
+#line 2278 "DirectPhotoPage.c"
 		} else {
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 2232 "DirectPhotoPage.c"
+#line 2282 "DirectPhotoPage.c"
 		}
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp6_;
-#line 2236 "DirectPhotoPage.c"
+#line 2286 "DirectPhotoPage.c"
 	} else {
-#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 2240 "DirectPhotoPage.c"
+#line 2290 "DirectPhotoPage.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	revert_possible = _tmp4_;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/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 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp13_) {
-#line 2248 "DirectPhotoPage.c"
+#line 2298 "DirectPhotoPage.c"
 		Photo* _tmp14_ = NULL;
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/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 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/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 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _tmp16_;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 2262 "DirectPhotoPage.c"
+#line 2312 "DirectPhotoPage.c"
 	} else {
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 2266 "DirectPhotoPage.c"
+#line 2316 "DirectPhotoPage.c"
 	}
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	rotate_possible = _tmp12_;
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/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 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp18_) {
-#line 2274 "DirectPhotoPage.c"
+#line 2324 "DirectPhotoPage.c"
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/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 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/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 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 2288 "DirectPhotoPage.c"
+#line 2338 "DirectPhotoPage.c"
 	} else {
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = FALSE;
-#line 2292 "DirectPhotoPage.c"
+#line 2342 "DirectPhotoPage.c"
 	}
-#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	enhance_possible = _tmp17_;
-#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = multiple;
-#line 251 "/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), "PrevPhoto", _tmp22_);
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = multiple;
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_);
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = rotate_possible;
-#line 253 "/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), "RotateClockwise", _tmp24_);
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = rotate_possible;
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_);
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = rotate_possible;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_);
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = rotate_possible;
-#line 256 "/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), "FlipVertically", _tmp27_);
-#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = revert_possible;
-#line 257 "/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), "Revert", _tmp28_);
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = enhance_possible;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_);
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/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 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_);
-#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 269 "/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 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp31_) {
-#line 2336 "DirectPhotoPage.c"
+#line 2386 "DirectPhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
 		Scaling _tmp34_ = {0};
@@ -2341,69 +2391,69 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		Photo* _tmp37_ = NULL;
 		Scaling _tmp38_ = {0};
 		gboolean _tmp39_ = FALSE;
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/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 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp34_);
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_);
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_);
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/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 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp38_);
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_);
-#line 264 "/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), "RedEye", _tmp39_);
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 2369 "DirectPhotoPage.c"
+#line 2419 "DirectPhotoPage.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/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 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = _tmp40_;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = _tmp41_ != NULL;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp41_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp42_) {
-#line 2381 "DirectPhotoPage.c"
+#line 2431 "DirectPhotoPage.c"
 		Photo* _tmp43_ = NULL;
 		Photo* _tmp44_ = NULL;
 		PhotoFileFormat _tmp45_ = 0;
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 278 "/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 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp44_ = _tmp43_;
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp45_ = photo_get_file_format (_tmp44_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 278 "/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 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp44_);
-#line 2395 "DirectPhotoPage.c"
+#line 2445 "DirectPhotoPage.c"
 	} else {
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 2399 "DirectPhotoPage.c"
+#line 2449 "DirectPhotoPage.c"
 	}
-#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = selected_count;
-#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = count;
-#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/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 2407 "DirectPhotoPage.c"
+#line 2457 "DirectPhotoPage.c"
 }
 
 
@@ -2435,216 +2485,216 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	GtkResponseType _tmp23_ = 0;
 	GtkResponseType _tmp24_ = 0;
 	GtkResponseType _tmp25_ = 0;
-#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE);
-#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = photo;
-#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2451 "DirectPhotoPage.c"
+#line 2501 "DirectPhotoPage.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = photo;
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = photo_has_alterations (_tmp1_);
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2463 "DirectPhotoPage.c"
+#line 2513 "DirectPhotoPage.c"
 	}
-#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = self->priv->drop_if_dirty;
-#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 2469 "DirectPhotoPage.c"
+#line 2519 "DirectPhotoPage.c"
 		Photo* _tmp4_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = photo;
-#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp4_);
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2479 "DirectPhotoPage.c"
+#line 2529 "DirectPhotoPage.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/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 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = photo_get_file_format (_tmp6_);
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = photo_file_format_can_write (_tmp7_);
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	is_writeable = _tmp9_;
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = is_writeable;
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_) {
-#line 2499 "DirectPhotoPage.c"
+#line 2549 "DirectPhotoPage.c"
 		const gchar* _tmp12_ = NULL;
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _ ("_Save");
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp12_;
-#line 2505 "DirectPhotoPage.c"
+#line 2555 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _ ("_Save a Copy");
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp13_;
-#line 2512 "DirectPhotoPage.c"
+#line 2562 "DirectPhotoPage.c"
 	}
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_option = _tmp14_;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = _ ("Lose changes to %s?");
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = photo;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = g_strdup_printf (_tmp15_, _tmp18_);
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = save_option;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _ ("Close _without Saving");
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL);
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = _tmp23_;
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp20_);
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp18_);
-#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp24_;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = response;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp25_ == GTK_RESPONSE_YES) {
-#line 2548 "DirectPhotoPage.c"
+#line 2598 "DirectPhotoPage.c"
 		Photo* _tmp26_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = photo;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp26_);
-#line 2554 "DirectPhotoPage.c"
+#line 2604 "DirectPhotoPage.c"
 	} else {
 		GtkResponseType _tmp27_ = 0;
-#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp27_ = response;
-#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp27_ == GTK_RESPONSE_NO) {
-#line 2561 "DirectPhotoPage.c"
+#line 2611 "DirectPhotoPage.c"
 			gboolean _tmp28_ = FALSE;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp28_ = is_writeable;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp28_) {
-#line 2567 "DirectPhotoPage.c"
+#line 2617 "DirectPhotoPage.c"
 				Photo* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				Photo* _tmp33_ = NULL;
 				PhotoFileFormat _tmp34_ = 0;
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = photo;
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/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 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = _tmp32_;
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = photo_get_file_format (_tmp33_);
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/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 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp31_);
-#line 2592 "DirectPhotoPage.c"
+#line 2642 "DirectPhotoPage.c"
 			} else {
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_on_save_as (self);
-#line 2596 "DirectPhotoPage.c"
+#line 2646 "DirectPhotoPage.c"
 			}
 		} else {
 			gboolean _tmp35_ = FALSE;
 			gboolean _tmp36_ = FALSE;
 			GtkResponseType _tmp37_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp37_ = response;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp37_ == GTK_RESPONSE_CANCEL) {
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = TRUE;
-#line 2608 "DirectPhotoPage.c"
+#line 2658 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp38_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp38_ = response;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT;
-#line 2615 "DirectPhotoPage.c"
+#line 2665 "DirectPhotoPage.c"
 			}
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp36_) {
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = TRUE;
-#line 2621 "DirectPhotoPage.c"
+#line 2671 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp39_ = 0;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp39_ = response;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE;
-#line 2628 "DirectPhotoPage.c"
+#line 2678 "DirectPhotoPage.c"
 			}
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp35_) {
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = FALSE;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (save_option);
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 2638 "DirectPhotoPage.c"
+#line 2688 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (save_option);
-#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2648 "DirectPhotoPage.c"
+#line 2698 "DirectPhotoPage.c"
 }
 
 
@@ -2654,23 +2704,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/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 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_);
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2674 "DirectPhotoPage.c"
+#line 2724 "DirectPhotoPage.c"
 }
 
 
@@ -2679,36 +2729,36 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 2693 "DirectPhotoPage.c"
+#line 2743 "DirectPhotoPage.c"
 		Photo* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = old_photo;
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp3_;
-#line 2702 "DirectPhotoPage.c"
+#line 2752 "DirectPhotoPage.c"
 	} else {
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2706 "DirectPhotoPage.c"
+#line 2756 "DirectPhotoPage.c"
 	}
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp0_;
-#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2712 "DirectPhotoPage.c"
+#line 2762 "DirectPhotoPage.c"
 }
 
 
@@ -2733,19 +2783,19 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	DirectViewCollection* _tmp30_ = NULL;
 	DirectPhoto* _tmp31_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (G_IS_FILE (dest));
-#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = constraint;
-#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = scale;
-#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
-#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling = _tmp2_;
-#line 2749 "DirectPhotoPage.c"
+#line 2799 "DirectPhotoPage.c"
 	{
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -2755,34 +2805,34 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/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 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = dest;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = scaling;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = quality;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = format;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = copy_unmodified;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = save_metadata;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_);
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2781 "DirectPhotoPage.c"
-			goto __catch45_g_error;
+#line 2831 "DirectPhotoPage.c"
+			goto __catch47_g_error;
 		}
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally47;
+	__catch47_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -2793,92 +2843,92 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		err = _inner_error_;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _ ("Error while saving to %s: %s");
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = dest;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = g_file_get_path (_tmp12_);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = err;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp18_, NULL);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp18_);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp14_);
-#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_error_free0 (err);
-#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2827 "DirectPhotoPage.c"
+#line 2877 "DirectPhotoPage.c"
 	}
-	__finally45:
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	__finally47:
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/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 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2838 "DirectPhotoPage.c"
+#line 2888 "DirectPhotoPage.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = direct_photo_global;
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = dest;
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE);
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp21_;
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp23_);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = photo;
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = direct_view_new (_tmp24_);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	tmp_view = _tmp25_;
-#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = self->priv->view_controller;
-#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = tmp_view;
-#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/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 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = direct_photo_global;
-#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = photo;
-#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_source_collection_reimport_photo (_tmp28_, _tmp29_);
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp30_ = self->priv->view_controller;
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp31_ = photo;
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 355 "/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 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp_view);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 2882 "DirectPhotoPage.c"
+#line 2932 "DirectPhotoPage.c"
 }
 
 
@@ -2896,84 +2946,84 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	Photo* _tmp15_ = NULL;
 	Photo* _tmp16_ = NULL;
 	PhotoFileFormat _tmp17_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/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 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = photo_has_alterations (_tmp3_);
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = !_tmp4_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 2916 "DirectPhotoPage.c"
+#line 2966 "DirectPhotoPage.c"
 	} else {
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/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 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = photo_get_file_format (_tmp7_);
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_file_format_can_write (_tmp8_);
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = !_tmp9_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2934 "DirectPhotoPage.c"
+#line 2984 "DirectPhotoPage.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_) {
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2940 "DirectPhotoPage.c"
+#line 2990 "DirectPhotoPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 360 "/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 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp10_;
-#line 2947 "DirectPhotoPage.c"
+#line 2997 "DirectPhotoPage.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2953 "DirectPhotoPage.c"
+#line 3003 "DirectPhotoPage.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/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 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/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 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = photo_get_file_format (_tmp16_);
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/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 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 2977 "DirectPhotoPage.c"
+#line 3027 "DirectPhotoPage.c"
 }
 
 
@@ -3038,114 +3088,114 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	gint _tmp54_ = 0;
 	gint _tmp55_ = 0;
 	GtkFileChooserDialog* _tmp74_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _ ("Save As");
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = export_dialog_new (_tmp0_);
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_dialog = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_format_parameters_last (&_tmp2_);
-#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_params = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = export_dialog;
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scale = _tmp4_;
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	constraint = _tmp5_;
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3070 "DirectPhotoPage.c"
+#line 3120 "DirectPhotoPage.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/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 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = export_params;
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = _tmp10_;
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	filename = _tmp11_;
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/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 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = export_params;
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_);
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	effective_export_format = _tmp16_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = effective_export_format;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = photo_file_format_get_properties (_tmp17_);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22__length1 = _tmp20_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_photo_file_format_properties_unref0 (_tmp19_);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = _tmp22_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions_length1 = _tmp22__length1;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_output_format_extensions_size_ = output_format_extensions_length1;
-#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = gtk_file_filter_new ();
-#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp23_);
-#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_filter = _tmp23_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = output_format_extensions;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24__length1 = output_format_extensions_length1;
-#line 3130 "DirectPhotoPage.c"
+#line 3180 "DirectPhotoPage.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection = _tmp24_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection_length1 = _tmp24__length1;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) {
-#line 3142 "DirectPhotoPage.c"
+#line 3192 "DirectPhotoPage.c"
 			gchar* _tmp25_ = NULL;
 			gchar* extension = NULL;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp25_ = g_strdup (extension_collection[extension_it]);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			extension = _tmp25_;
-#line 3149 "DirectPhotoPage.c"
+#line 3199 "DirectPhotoPage.c"
 			{
 				gchar* uppercase_extension = NULL;
 				const gchar* _tmp26_ = NULL;
@@ -3158,109 +3208,109 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 				const gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = extension;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1);
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				uppercase_extension = _tmp27_;
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = output_format_filter;
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = extension;
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = g_strconcat ("*.", _tmp29_, NULL);
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp28_, _tmp31_);
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp31_);
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = output_format_filter;
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = uppercase_extension;
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = g_strconcat ("*.", _tmp33_, NULL);
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp34_;
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp32_, _tmp35_);
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp35_);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (uppercase_extension);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (extension);
-#line 3196 "DirectPhotoPage.c"
+#line 3246 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp36_ = _ ("Save As");
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp37_ = app_window_get_instance ();
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp38_ = _tmp37_;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/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 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = _tmp39_;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp38_);
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as_dialog = _tmp40_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = save_as_dialog;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 393 "/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 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = save_as_dialog;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp43_ = filename;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 394 "/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 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp44_ = save_as_dialog;
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp45_ = self->priv->current_save_dir;
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = g_file_get_path (_tmp45_);
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = _tmp46_;
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/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 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp47_);
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp48_ = save_as_dialog;
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp49_ = output_format_filter;
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp50_ = _g_object_ref0 (_tmp49_);
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 396 "/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 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp51_ = save_as_dialog;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/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 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp52_ = save_as_dialog;
-#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/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 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp53_ = save_as_dialog;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog));
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp54_;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp55_ = response;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) {
-#line 3264 "DirectPhotoPage.c"
+#line 3314 "DirectPhotoPage.c"
 		GtkFileChooserDialog* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -3279,106 +3329,106 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 		gchar* _tmp71_ = NULL;
 		gchar* _tmp72_ = NULL;
 		GFile* _tmp73_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = TRUE;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp56_ = save_as_dialog;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/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 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp59_ = g_file_new_for_uri (_tmp58_);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp61_ = scale;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp62_ = constraint;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp63_ = export_params;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp64_ = _tmp63_.quality;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp65_ = effective_export_format;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp66_ = export_params;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp67_ = _tmp66_.mode;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp68_ = export_params;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp69_ = _tmp68_.export_metadata;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/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 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp58_);
-#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = FALSE;
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp70_ = save_as_dialog;
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/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 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp72_ = _tmp71_;
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp73_ = g_file_new_for_path (_tmp72_);
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self->priv->current_save_dir);
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->current_save_dir = _tmp73_;
-#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp72_);
-#line 3335 "DirectPhotoPage.c"
+#line 3385 "DirectPhotoPage.c"
 	}
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp74_ = save_as_dialog;
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (save_as_dialog);
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (output_format_filter);
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/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 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (filename);
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 3351 "DirectPhotoPage.c"
+#line 3401 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/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 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 3363 "DirectPhotoPage.c"
+#line 3413 "DirectPhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 3382 "DirectPhotoPage.c"
+#line 3432 "DirectPhotoPage.c"
 	}
 }
 
@@ -3392,93 +3442,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 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 3400 "DirectPhotoPage.c"
+#line 3450 "DirectPhotoPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	handled = TRUE;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = event;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3423 "DirectPhotoPage.c"
+#line 3473 "DirectPhotoPage.c"
 			default:
 			{
-#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3430 "DirectPhotoPage.c"
+#line 3480 "DirectPhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3436 "DirectPhotoPage.c"
+#line 3486 "DirectPhotoPage.c"
 			default:
 			{
-#line 423 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3443 "DirectPhotoPage.c"
+#line 3493 "DirectPhotoPage.c"
 			}
 		}
 	} else {
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3449 "DirectPhotoPage.c"
+#line 3499 "DirectPhotoPage.c"
 			default:
 			{
-#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				handled = FALSE;
-#line 428 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3456 "DirectPhotoPage.c"
+#line 3506 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = handled;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp7_) {
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = TRUE;
-#line 3466 "DirectPhotoPage.c"
+#line 3516 "DirectPhotoPage.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = event;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/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 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _tmp9_;
-#line 3476 "DirectPhotoPage.c"
+#line 3526 "DirectPhotoPage.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp6_;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3482 "DirectPhotoPage.c"
+#line 3532 "DirectPhotoPage.c"
 }
 
 
@@ -3487,128 +3537,128 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 434 "/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 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 3505 "DirectPhotoPage.c"
+#line 3555 "DirectPhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3532 "DirectPhotoPage.c"
+#line 3582 "DirectPhotoPage.c"
 	}
 }
 
 
 static Block6Data* block6_data_ref (Block6Data* _data6_) {
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_atomic_int_inc (&_data6_->_ref_count_);
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return _data6_;
-#line 3542 "DirectPhotoPage.c"
+#line 3592 "DirectPhotoPage.c"
 }
 
 
 static void block6_data_unref (void * _userdata_) {
 	Block6Data* _data6_;
 	_data6_ = (Block6Data*) _userdata_;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
-#line 3551 "DirectPhotoPage.c"
+#line 3601 "DirectPhotoPage.c"
 		DirectPhotoPage* self;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self = _data6_->self;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self);
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_slice_free (Block6Data, _data6_);
-#line 3559 "DirectPhotoPage.c"
+#line 3609 "DirectPhotoPage.c"
 	}
 }
 
 
-static gboolean __lambda14_ (Block6Data* _data6_) {
+static gboolean __lambda15_ (Block6Data* _data6_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = _data6_->self;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _data6_->should_allow_rotation;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/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 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3578 "DirectPhotoPage.c"
+#line 3628 "DirectPhotoPage.c"
 }
 
 
-static gboolean ___lambda14__gsource_func (gpointer self) {
+static gboolean ___lambda15__gsource_func (gpointer self) {
 	gboolean result;
-	result = __lambda14_ (self);
-#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	result = __lambda15_ (self);
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3587 "DirectPhotoPage.c"
+#line 3637 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
 	Block6Data* _data6_;
 	gboolean _tmp0_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = g_slice_new0 (Block6Data);
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->_ref_count_ = 1;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->self = g_object_ref (self);
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = should_allow_rotation;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->should_allow_rotation = _tmp0_;
-#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 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref);
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block6_data_unref (_data6_);
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = NULL;
-#line 3612 "DirectPhotoPage.c"
+#line 3662 "DirectPhotoPage.c"
 }
 
 
@@ -3617,19 +3667,19 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	DirectView* _tmp1_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = source;
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3633 "DirectPhotoPage.c"
+#line 3683 "DirectPhotoPage.c"
 }
 
 
@@ -3643,6 +3693,8 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->add_actions = direct_photo_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	((PageClass *) klass)->remove_actions = direct_photo_page_real_remove_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"
 	((GtkWidgetClass *) klass)->realize = direct_photo_page_real_realize;
@@ -3668,7 +3720,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 3672 "DirectPhotoPage.c"
+#line 3724 "DirectPhotoPage.c"
 }
 
 
@@ -3679,7 +3731,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 3683 "DirectPhotoPage.c"
+#line 3735 "DirectPhotoPage.c"
 }
 
 
@@ -3703,7 +3755,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 3707 "DirectPhotoPage.c"
+#line 3759 "DirectPhotoPage.c"
 }
 
 
@@ -3722,46 +3774,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 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
-#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 3734 "DirectPhotoPage.c"
+#line 3786 "DirectPhotoPage.c"
 }
 
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
-#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 3741 "DirectPhotoPage.c"
+#line 3793 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectFullscreenPhotoPage * self;
 	GeeList* _tmp0_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 472 "/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 3756 "DirectPhotoPage.c"
+#line 3808 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) {
-#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 3765 "DirectPhotoPage.c"
+#line 3817 "DirectPhotoPage.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 9688aa5..a48f9e0 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -65,12 +65,19 @@ public class DirectPhotoPage : EditingHostPage {
         { "Zoom200", snap_zoom_to_max }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
     }
-    
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
     protected override InjectionGroup[] init_collect_injection_groups() {
         InjectionGroup[] groups = base.init_collect_injection_groups();
         
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index e3cebb7..f2ef1b1 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.32.1, the Vala compiler
+/* DirectView.c generated by valac 0.34.4, the Vala compiler
  * generated from DirectView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index dc9432e..06465a8 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.32.1, the Vala compiler
+/* DirectWindow.c generated by valac 0.34.4, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -326,7 +326,6 @@ void page_switched_to (Page* self);
 GtkToolbar* page_get_toolbar (Page* self);
 void application_set_menubar (GMenuModel* model);
 GMenuModel* page_get_menubar (Page* self);
-void application_set_appmenu (GMenuModel* model);
 DirectWindow* direct_window_get_app (void);
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self);
 Page* page_window_get_current_page (PageWindow* self);
@@ -365,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 369 "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 376 "DirectWindow.c"
+#line 375 "DirectWindow.c"
 }
 
 
@@ -395,12 +394,9 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 	DirectPhotoPage* _tmp13_ = NULL;
 	GtkToolbar* _tmp14_ = NULL;
 	GtkToolbar* _tmp15_ = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	DirectPhotoPage* _tmp17_ = NULL;
+	DirectPhotoPage* _tmp16_ = NULL;
+	GMenuModel* _tmp17_ = NULL;
 	GMenuModel* _tmp18_ = NULL;
-	GMenuModel* _tmp19_ = NULL;
-	GObject* _tmp20_ = 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"
@@ -468,46 +464,36 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 #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_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui");
+	_tmp16_ = self->priv->direct_photo_page;
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	builder = _tmp16_;
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp17_ = self->priv->direct_photo_page;
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp18_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page));
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp19_ = _tmp18_;
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	application_set_menubar (_tmp19_);
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp19_);
-#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp20_ = gtk_builder_get_object (builder, "direct-appmenu");
+	_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 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 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, g_menu_get_type ()) ? ((GMenu*) _tmp20_) : NULL, g_menu_model_get_type (), GMenuModel));
-#line 31 "/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 (builder);
-#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 497 "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 504 "DirectWindow.c"
+#line 490 "DirectWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 35 "/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 511 "DirectWindow.c"
+#line 497 "DirectWindow.c"
 }
 
 
@@ -515,30 +501,30 @@ DirectWindow* direct_window_get_app (void) {
 	DirectWindow* result = NULL;
 	AppWindow* _tmp0_ = NULL;
 	DirectWindow* _tmp1_ = NULL;
-#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 35 "/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 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp1_;
-#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 527 "DirectWindow.c"
+#line 513 "DirectWindow.c"
 }
 
 
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	DirectPhotoPage* result = NULL;
 	Page* _tmp0_ = NULL;
-#line 38 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
-#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#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 39 "/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 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 542 "DirectWindow.c"
+#line 528 "DirectWindow.c"
 }
 
 
@@ -555,53 +541,53 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 42 "/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 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = modified;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp1_) {
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "*";
-#line 569 "DirectWindow.c"
+#line 555 "DirectWindow.c"
 	} else {
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "";
-#line 573 "DirectWindow.c"
+#line 559 "DirectWindow.c"
 	}
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = file;
-#line 43 "/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 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = file;
-#line 43 "/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 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp8_ = get_display_pathname (_tmp7_);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 43 "/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 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 43 "/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 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp11_);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp9_);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp4_);
-#line 605 "DirectWindow.c"
+#line 591 "DirectWindow.c"
 }
 
 
@@ -614,33 +600,33 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 	GFile* _tmp3_ = NULL;
 	DirectFullscreenPhotoPage* _tmp4_ = NULL;
 	DirectFullscreenPhotoPage* _tmp5_ = NULL;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 48 "/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 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	file = _tmp3_;
-#line 50 "/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 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 50 "/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 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (file);
-#line 644 "DirectWindow.c"
+#line 630 "DirectWindow.c"
 }
 
 
@@ -648,15 +634,15 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	DirectWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_DIRECT_ROLE);
-#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp0_;
-#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 660 "DirectWindow.c"
+#line 646 "DirectWindow.c"
 }
 
 
@@ -665,43 +651,43 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 	DirectPhotoPage* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	Photo* _tmp2_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = self->priv->direct_photo_page;
-#line 58 "/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 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	photo = _tmp1_;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = photo;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 681 "DirectWindow.c"
+#line 667 "DirectWindow.c"
 		Photo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		Photo* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
-#line 60 "/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 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = photo;
-#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp7_ = photo_has_alterations (_tmp6_);
-#line 60 "/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 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 701 "DirectWindow.c"
+#line 687 "DirectWindow.c"
 	}
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (photo);
-#line 705 "DirectWindow.c"
+#line 691 "DirectWindow.c"
 }
 
 
@@ -715,39 +701,39 @@ static void direct_window_real_on_quit (AppWindow* base) {
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	Dimensions _tmp7_ = {0};
-#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 64 "/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 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp3_) {
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return;
-#line 735 "DirectWindow.c"
+#line 721 "DirectWindow.c"
 	}
-#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 67 "/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 67 "/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 67 "/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 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 69 "/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 751 "DirectWindow.c"
+#line 737 "DirectWindow.c"
 }
 
 
@@ -759,50 +745,50 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 72 "/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 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 73 "/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 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp3_) {
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 783 "DirectWindow.c"
+#line 769 "DirectWindow.c"
 	}
-#line 76 "/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 787 "DirectWindow.c"
+#line 773 "DirectWindow.c"
 		GdkEventAny* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = event;
-#line 76 "/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 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 796 "DirectWindow.c"
+#line 782 "DirectWindow.c"
 	} else {
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = FALSE;
-#line 800 "DirectWindow.c"
+#line 786 "DirectWindow.c"
 	}
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 806 "DirectWindow.c"
+#line 792 "DirectWindow.c"
 }
 
 
@@ -811,29 +797,29 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	GdkEventType _tmp1_ = 0;
-#line 79 "/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 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->type;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#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 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 831 "DirectWindow.c"
+#line 817 "DirectWindow.c"
 	}
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = FALSE;
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 837 "DirectWindow.c"
+#line 823 "DirectWindow.c"
 }
 
 
@@ -844,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 89 "/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 89 "/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 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#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 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 866 "DirectWindow.c"
+#line 852 "DirectWindow.c"
 	}
-#line 98 "/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 870 "DirectWindow.c"
+#line 856 "DirectWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = event;
-#line 98 "/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 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 879 "DirectWindow.c"
+#line 865 "DirectWindow.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = FALSE;
-#line 883 "DirectWindow.c"
+#line 869 "DirectWindow.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp3_;
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 889 "DirectWindow.c"
+#line 875 "DirectWindow.c"
 }
 
 
@@ -908,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 912 "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 919 "DirectWindow.c"
+#line 905 "DirectWindow.c"
 }
 
 
@@ -927,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 931 "DirectWindow.c"
+#line 917 "DirectWindow.c"
 }
 
 
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index ee1995a..e1cbf75 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -24,9 +24,7 @@ public class DirectWindow : AppWindow {
         layout.pack_start(direct_photo_page, true, true, 0);
         layout.pack_end(direct_photo_page.get_toolbar(), false, false, 0);
         
-        var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
         Application.set_menubar (direct_photo_page.get_menubar ());
-        Application.set_appmenu (builder.get_object ("direct-appmenu") as GLib.Menu);
 
         add(layout);
     }
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index 05012c9..d1fe68f 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.32.1, the Vala compiler
+/* EditingTools.c generated by valac 0.34.4, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4264,7 +4264,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 #line 103 "/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 103 "/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_TYPE_PIXBUF, GDK_TYPE_RECTANGLE);
+	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 4269 "EditingTools.c"
 }
 
@@ -4931,7 +4931,7 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass
 #line 469 "/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 469 "/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_TYPE_PIXBUF, TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
+	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 469 "/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 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6769,15 +6769,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 6783 "EditingTools.c"
 }
@@ -13779,7 +13779,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13782 "EditingTools.c"
-			goto __catch20_g_error;
+			goto __catch22_g_error;
 		}
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp6_;
@@ -13793,8 +13793,8 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		_g_object_unref0 (_tmp6_);
 #line 13795 "EditingTools.c"
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally22;
+	__catch22_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -13817,7 +13817,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		return;
 #line 13819 "EditingTools.c"
 	}
-	__finally20:
+	__finally22:
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index cd0a017..9ef9fef 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.32.1, the Vala compiler
+/* StraightenTool.c generated by valac 0.34.4, the Vala compiler
  * generated from StraightenTool.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1070,7 +1070,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 #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;
+			goto __catch23_g_error;
 		}
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp14_ = _tmp6_;
@@ -1084,8 +1084,8 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		_g_object_unref0 (_tmp6_);
 #line 1086 "StraightenTool.c"
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally23;
+	__catch23_g_error:
 	{
 		GError* e = NULL;
 		EditingToolsPhotoCanvas* _tmp15_ = NULL;
@@ -1124,7 +1124,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		_g_error_free0 (e);
 #line 1126 "StraightenTool.c"
 	}
-	__finally21:
+	__finally23:
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
diff --git a/src/events/Branch.c b/src/events/Branch.c
index 193a8ee..ac8b255 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2140,13 +2140,13 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 2152 "Branch.c"
 }
@@ -2173,35 +2173,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2207 "Branch.c"
 }
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index f63d633..b50047a 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.32.1, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.34.4, the Vala compiler
  * generated from EventDirectoryItem.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch49_g_error;
+			goto __catch51_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 __finally49;
-	__catch49_g_error:
+	goto __finally51;
+	__catch51_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"
 	}
-	__finally49:
+	__finally51:
 #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 __catch50_g_error;
+				goto __catch52_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 __finally50;
-		__catch50_g_error:
+		goto __finally52;
+		__catch52_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"
 		}
-		__finally50:
+		__finally52:
 #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 04ee3ff..7d16d2a 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.32.1, the Vala compiler
+/* EventPage.c generated by valac 0.34.4, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -305,16 +305,6 @@ 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))
@@ -417,6 +407,16 @@ 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))
@@ -536,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -829,10 +830,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 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_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void event_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -879,6 +880,7 @@ 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);
@@ -935,35 +937,35 @@ static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_o
 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 939 "EventPage.c"
+#line 941 "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"
+#line 948 "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"
+#line 955 "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"
+#line 962 "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 967 "EventPage.c"
+#line 969 "EventPage.c"
 }
 
 
@@ -972,7 +974,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 976 "EventPage.c"
+#line 978 "EventPage.c"
 }
 
 
@@ -1018,21 +1020,21 @@ EventPage* event_page_construct (GType object_type, Event* page_event) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp7_);
 #line 16 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/EventContextMenu");
+	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventContextMenu");
 #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = event_global;
 #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	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 1029 "EventPage.c"
+#line 1031 "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 1036 "EventPage.c"
+#line 1038 "EventPage.c"
 }
 
 
@@ -1050,7 +1052,7 @@ Event* event_page_get_event (EventPage* self) {
 	result = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1054 "EventPage.c"
+#line 1056 "EventPage.c"
 }
 
 
@@ -1074,7 +1076,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 1078 "EventPage.c"
+#line 1080 "EventPage.c"
 		ViewCollection* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -1095,7 +1097,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 1099 "EventPage.c"
+#line 1101 "EventPage.c"
 		}
 	}
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1106,7 +1108,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 1110 "EventPage.c"
+#line 1112 "EventPage.c"
 }
 
 
@@ -1126,27 +1128,74 @@ 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 1130 "EventPage.c"
+#line 1132 "EventPage.c"
 }
 
 
-static void event_page_real_add_actions (Page* base) {
+static void event_page_real_add_actions (Page* base, GActionMap* map) {
 	EventPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
+#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #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"
-	_tmp0_ = app_window_get_instance ();
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#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), _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);
+	_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 1150 "EventPage.c"
+	g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+#line 1152 "EventPage.c"
+}
+
+
+static void event_page_real_remove_actions (Page* base, GActionMap* map) {
+	EventPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
+#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	_tmp0_ = map;
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+#line 1167 "EventPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+		entry_collection = EVENT_PAGE_entries;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (EVENT_PAGE_entries);
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENT_PAGE_entries); entry_it = entry_it + 1) {
+#line 1179 "EventPage.c"
+			GActionEntry entry = {0};
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+			entry = entry_collection[entry_it];
+#line 1183 "EventPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp1_ = map;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp2_ = entry;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1196 "EventPage.c"
+			}
+		}
+	}
 }
 
 
@@ -1154,15 +1203,15 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 	EventPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/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 1166 "EventPage.c"
+#line 1215 "EventPage.c"
 }
 
 
@@ -1171,23 +1220,23 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 66 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 74 "/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 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = selected_count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/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 76 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE);
-#line 1191 "EventPage.c"
+#line 1240 "EventPage.c"
 }
 
 
@@ -1199,31 +1248,31 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/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 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1221 "EventPage.c"
+#line 1270 "EventPage.c"
 	}
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1227 "EventPage.c"
+#line 1276 "EventPage.c"
 	}
 }
 
@@ -1234,21 +1283,21 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/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 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1252 "EventPage.c"
+#line 1301 "EventPage.c"
 }
 
 
@@ -1256,33 +1305,33 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 	GeeMap* _tmp0_ = NULL;
 	Event* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = map;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = self->priv->page_event;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/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 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp2_) {
-#line 1272 "EventPage.c"
+#line 1321 "EventPage.c"
 		Event* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp3_ = self->priv->page_event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp5_);
-#line 1286 "EventPage.c"
+#line 1335 "EventPage.c"
 	}
 }
 
@@ -1293,21 +1342,21 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 1311 "EventPage.c"
+#line 1360 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
 		Event* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1325,69 +1374,69 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 		CommandManager* _tmp15_ = NULL;
 		CommandManager* _tmp16_ = NULL;
 		EditEventCommentCommand* _tmp17_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = self->priv->page_event;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource));
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp6_ = _tmp5_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp8_ = _tmp7_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp6_);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		edit_comment_dialog = _tmp8_;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp9_ = edit_comment_dialog;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp10_ = edit_comment_dialog_execute (_tmp9_);
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		new_comment = _tmp10_;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp11_ = new_comment;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		if (_tmp11_ == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_g_free0 (new_comment);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return;
-#line 1359 "EventPage.c"
+#line 1408 "EventPage.c"
 		}
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp12_ = self->priv->page_event;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp13_ = new_comment;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_);
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command = _tmp14_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp16_ = _tmp15_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp17_ = command;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_command_manager_unref0 (_tmp16_);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_object_unref0 (command);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (new_comment);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1387 "EventPage.c"
+#line 1436 "EventPage.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/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 1391 "EventPage.c"
+#line 1440 "EventPage.c"
 }
 
 
@@ -1403,47 +1452,47 @@ static void event_page_on_make_primary (EventPage* self) {
 	DataView* _tmp8_ = NULL;
 	DataSource* _tmp9_ = NULL;
 	MediaSource* _tmp10_ = NULL;
-#line 108 "/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 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1423 "EventPage.c"
+#line 1472 "EventPage.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = self->priv->page_event;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = data_view_get_source (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_set_primary_source (_tmp4_, _tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1447 "EventPage.c"
+#line 1496 "EventPage.c"
 }
 
 
@@ -1451,19 +1500,19 @@ static void event_page_on_rename (EventPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	Event* _tmp2_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = self->priv->page_event;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1467 "EventPage.c"
+#line 1516 "EventPage.c"
 }
 
 
@@ -1479,6 +1528,8 @@ static void event_page_class_init (EventPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->add_actions = event_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	((PageClass *) klass)->remove_actions = event_page_real_remove_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"
 	((PageClass *) klass)->update_actions = event_page_real_update_actions;
@@ -1490,14 +1541,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 1494 "EventPage.c"
+#line 1545 "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 1501 "EventPage.c"
+#line 1552 "EventPage.c"
 }
 
 
@@ -1527,7 +1578,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 1531 "EventPage.c"
+#line 1582 "EventPage.c"
 }
 
 
@@ -1559,56 +1610,56 @@ NoEventPage* no_event_page_construct (GType object_type) {
 	Alteration* _tmp10_ = NULL;
 	ViewCollectionMonitor* _tmp11_ = NULL;
 	ViewCollectionMonitor* _tmp12_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = no_event_page_no_event_view_manager_new (self);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	filter = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = _tmp1_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = library_photo_global;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = no_event_page_no_event_page_alteration;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/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 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp6_);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = video_global;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = no_event_page_no_event_page_alteration;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/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 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp12_ = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp12_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_manager_unref0 (filter);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1605 "EventPage.c"
+#line 1656 "EventPage.c"
 }
 
 
 NoEventPage* no_event_page_new (void) {
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1612 "EventPage.c"
+#line 1663 "EventPage.c"
 }
 
 
@@ -1620,31 +1671,31 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/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 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1642 "EventPage.c"
+#line 1693 "EventPage.c"
 	}
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1648 "EventPage.c"
+#line 1699 "EventPage.c"
 	}
 }
 
@@ -1655,43 +1706,43 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/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 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1673 "EventPage.c"
+#line 1724 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
 	NoEventPageNoEventViewManager* self = NULL;
 	NoEventPage* _tmp0_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page;
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 133 "/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 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1688 "EventPage.c"
+#line 1739 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/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 1695 "EventPage.c"
+#line 1746 "EventPage.c"
 }
 
 
@@ -1702,46 +1753,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 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 137 "/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 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = source;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/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 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_.id;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_ != EVENT_ID_INVALID) {
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = FALSE;
-#line 1720 "EventPage.c"
+#line 1771 "EventPage.c"
 	} else {
 		DataSource* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = source;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/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 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1730 "EventPage.c"
+#line 1781 "EventPage.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	result = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1736 "EventPage.c"
+#line 1787 "EventPage.c"
 }
 
 
 static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) {
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/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 1745 "EventPage.c"
+#line 1796 "EventPage.c"
 }
 
 
@@ -1763,19 +1814,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 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_parent_class = g_type_class_peek_parent (klass);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = no_event_page_real_get_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = no_event_page_real_set_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = alteration_new ("metadata", "event");
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_page_alteration = _tmp0_;
-#line 1779 "EventPage.c"
+#line 1830 "EventPage.c"
 }
 
 
@@ -1785,11 +1836,11 @@ static void no_event_page_instance_init (NoEventPage * self) {
 
 static void no_event_page_finalize (GObject* obj) {
 	NoEventPage * self;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1793 "EventPage.c"
+#line 1844 "EventPage.c"
 }
 
 
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala
index 8b271d1..960eee8 100644
--- a/src/events/EventPage.vala
+++ b/src/events/EventPage.vala
@@ -13,7 +13,7 @@ public class EventPage : CollectionPage {
         this.page_event = page_event;
         page_event.mirror_photos(get_view(), create_thumbnail);
         
-        init_page_context_menu("/EventContextMenu");
+        init_page_context_menu("EventContextMenu");
         
         Event.global.items_altered.connect(on_events_altered);
     }
@@ -53,10 +53,17 @@ public class EventPage : CollectionPage {
         { "EditEventComment", on_edit_comment }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions(GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries(entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     protected override void init_actions(int selected_count, int count) {
diff --git a/src/events/Events.c b/src/events/Events.c
index d99ab32..6c6dc44 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.32.1, the Vala compiler
+/* Events.c generated by valac 0.34.4, the Vala compiler
  * generated from Events.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index bf6b264..c31c92e 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.32.1, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.34.4, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <time.h>
 #include <cairo.h>
@@ -353,6 +353,7 @@ typedef struct _CheckerboardItemPrivate CheckerboardItemPrivate;
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
 typedef struct _EventDirectoryItemPrivate EventDirectoryItemPrivate;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_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))
@@ -363,7 +364,6 @@ 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))
@@ -583,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -996,11 +997,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 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 void events_directory_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
 static GVariant* _variant_new14 (gboolean value);
+static void events_directory_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -1010,6 +1011,7 @@ 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);
@@ -1130,42 +1132,42 @@ static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events
 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"
+#line 1136 "EventsDirectoryPage.c"
 }
 
 
 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"
+#line 1143 "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"
+#line 1150 "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"
+#line 1157 "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"
+#line 1164 "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"
+#line 1171 "EventsDirectoryPage.c"
 }
 
 
@@ -1174,14 +1176,14 @@ static gboolean _events_directory_page_event_comparator_predicate_comparator_pre
 	result = events_directory_page_event_comparator_predicate (object, alteration);
 #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1178 "EventsDirectoryPage.c"
+#line 1180 "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 1185 "EventsDirectoryPage.c"
+#line 1187 "EventsDirectoryPage.c"
 }
 
 
@@ -1336,7 +1338,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 1340 "EventsDirectoryPage.c"
+#line 1342 "EventsDirectoryPage.c"
 }
 
 
@@ -1356,7 +1358,7 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
 	_tmp1_ = ui_filenames;
 #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 1360 "EventsDirectoryPage.c"
+#line 1362 "EventsDirectoryPage.c"
 }
 
 
@@ -1376,7 +1378,7 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
 	result = _tmp1_;
 #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1380 "EventsDirectoryPage.c"
+#line 1382 "EventsDirectoryPage.c"
 }
 
 
@@ -1410,7 +1412,7 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
 	result = (gint64) (start_a - start_b);
 #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1414 "EventsDirectoryPage.c"
+#line 1416 "EventsDirectoryPage.c"
 }
 
 
@@ -1429,7 +1431,7 @@ static gint64 events_directory_page_event_descending_comparator (void* a, void*
 	result = _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1433 "EventsDirectoryPage.c"
+#line 1435 "EventsDirectoryPage.c"
 }
 
 
@@ -1438,7 +1440,7 @@ static gint64 _events_directory_page_event_ascending_comparator_comparator (void
 	result = events_directory_page_event_ascending_comparator (a, b);
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1442 "EventsDirectoryPage.c"
+#line 1444 "EventsDirectoryPage.c"
 }
 
 
@@ -1447,7 +1449,7 @@ static gint64 _events_directory_page_event_descending_comparator_comparator (voi
 	result = events_directory_page_event_descending_comparator (a, b);
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1451 "EventsDirectoryPage.c"
+#line 1453 "EventsDirectoryPage.c"
 }
 
 
@@ -1458,7 +1460,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 	_tmp0_ = ascending;
 #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_) {
-#line 1462 "EventsDirectoryPage.c"
+#line 1464 "EventsDirectoryPage.c"
 		Comparator _tmp1_ = NULL;
 		void* _tmp1__target = NULL;
 		GDestroyNotify _tmp1__target_destroy_notify = NULL;
@@ -1476,7 +1478,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 		result = _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 1480 "EventsDirectoryPage.c"
+#line 1482 "EventsDirectoryPage.c"
 	} else {
 		Comparator _tmp2_ = NULL;
 		void* _tmp2__target = NULL;
@@ -1495,7 +1497,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 		result = _tmp2_;
 #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 1499 "EventsDirectoryPage.c"
+#line 1501 "EventsDirectoryPage.c"
 	}
 }
 
@@ -1503,14 +1505,14 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 static GVariant* _variant_new14 (gboolean value) {
 #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 1507 "EventsDirectoryPage.c"
+#line 1509 "EventsDirectoryPage.c"
 }
 
 
-static void events_directory_page_real_add_actions (Page* base) {
+static void events_directory_page_real_add_actions (Page* base, GActionMap* map) {
 	EventsDirectoryPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 	gboolean display_comments = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
@@ -1521,16 +1523,16 @@ static void events_directory_page_real_add_actions (Page* base) {
 	GVariant* _tmp8_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
+#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #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"
-	_tmp0_ = app_window_get_instance ();
-#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#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), _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);
+	_tmp1_ = map;
 #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp1_);
+	g_action_map_add_action_entries (_tmp1_, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self);
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = config_facade_get_instance ();
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1555,7 +1557,54 @@ static void events_directory_page_real_add_actions (Page* base) {
 	_g_variant_unref0 (_tmp8_);
 #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 1559 "EventsDirectoryPage.c"
+#line 1561 "EventsDirectoryPage.c"
+}
+
+
+static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) {
+	EventsDirectoryPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
+#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp0_ = map;
+#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 1576 "EventsDirectoryPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+		entry_collection = EVENTS_DIRECTORY_PAGE_entries;
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries);
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); entry_it = entry_it + 1) {
+#line 1588 "EventsDirectoryPage.c"
+			GActionEntry entry = {0};
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+			entry = entry_collection[entry_it];
+#line 1592 "EventsDirectoryPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+				_tmp1_ = map;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+				_tmp2_ = entry;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1605 "EventsDirectoryPage.c"
+			}
+		}
+	}
 }
 
 
@@ -1566,33 +1615,33 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	GSimpleAction* action = NULL;
 	GAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 132 "/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"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = selected_count;
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = count;
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/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 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents");
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_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"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_ == NULL) {
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1586 "EventsDirectoryPage.c"
+#line 1635 "EventsDirectoryPage.c"
 	}
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp3_;
-#line 129 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 130 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 137 "/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"
+#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
-#line 1596 "EventsDirectoryPage.c"
+#line 1645 "EventsDirectoryPage.c"
 }
 
 
@@ -1603,29 +1652,29 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = selected_count;
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 141 "/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 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", TRUE);
-#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = selected_count;
-#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/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 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = selected_count;
-#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 144 "/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 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = selected_count;
-#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = count;
-#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/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 1629 "EventsDirectoryPage.c"
+#line 1678 "EventsDirectoryPage.c"
 }
 
 
@@ -1634,17 +1683,17 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = _ ("No events");
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1648 "EventsDirectoryPage.c"
+#line 1697 "EventsDirectoryPage.c"
 }
 
 
@@ -1653,24 +1702,24 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = _ ("No events found");
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1667 "EventsDirectoryPage.c"
+#line 1716 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1674 "EventsDirectoryPage.c"
+#line 1723 "EventsDirectoryPage.c"
 }
 
 
@@ -1682,31 +1731,31 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	LibraryWindow* _tmp2_ = NULL;
 	LibraryWindow* _tmp3_ = NULL;
 	Event* _tmp4_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = item;
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem));
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp1_;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = library_window_get_app ();
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event->event;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	library_window_switch_to_event (_tmp3_, _tmp4_);
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1710 "EventsDirectoryPage.c"
+#line 1759 "EventsDirectoryPage.c"
 }
 
 
@@ -1723,45 +1772,45 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	GDestroyNotify _tmp7__target_destroy_notify = NULL;
 	GSimpleAction* _tmp8_ = NULL;
 	GVariant* _tmp9_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/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"
+#line 164 "/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"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = value;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/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"
+#line 164 "/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"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = _tmp6_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target = _tmp4_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target_destroy_notify = _tmp5_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/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"
+#line 164 "/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"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target_destroy_notify = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = action;
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = value;
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1765 "EventsDirectoryPage.c"
+#line 1814 "EventsDirectoryPage.c"
 }
 
 
@@ -1794,101 +1843,101 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	RenameEventCommand* _tmp23_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1814 "EventsDirectoryPage.c"
+#line 1863 "EventsDirectoryPage.c"
 	}
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_get_raw_name (_tmp9_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = event_rename_dialog_new (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	rename_dialog = _tmp13_;
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = rename_dialog;
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = event_rename_dialog_execute (_tmp14_);
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_name = _tmp15_;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_name;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_name);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1862 "EventsDirectoryPage.c"
+#line 1911 "EventsDirectoryPage.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_name;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = rename_event_command_new (_tmp18_, _tmp19_);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_name);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1892 "EventsDirectoryPage.c"
+#line 1941 "EventsDirectoryPage.c"
 }
 
 
@@ -1921,101 +1970,101 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	EditEventCommentCommand* _tmp23_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1941 "EventsDirectoryPage.c"
+#line 1990 "EventsDirectoryPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	edit_comment_dialog = _tmp13_;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = edit_comment_dialog;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = edit_comment_dialog_execute (_tmp14_);
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_comment = _tmp15_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_comment;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_comment);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1989 "EventsDirectoryPage.c"
+#line 2038 "EventsDirectoryPage.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_comment;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_comment);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2019 "EventsDirectoryPage.c"
+#line 2068 "EventsDirectoryPage.c"
 }
 
 
@@ -2034,55 +2083,55 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	MergeEventsCommand* _tmp12_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ <= 1;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2054 "EventsDirectoryPage.c"
+#line 2103 "EventsDirectoryPage.c"
 	}
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = _tmp6_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp9_;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = command;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2086 "EventsDirectoryPage.c"
+#line 2135 "EventsDirectoryPage.c"
 }
 
 
@@ -2094,40 +2143,40 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/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"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = value;
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	display = _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 214 "/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 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/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 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = action;
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = value;
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2124 "EventsDirectoryPage.c"
+#line 2173 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2131 "EventsDirectoryPage.c"
+#line 2180 "EventsDirectoryPage.c"
 }
 
 
@@ -2136,17 +2185,17 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	SearchViewFilter* result = NULL;
 	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2150 "EventsDirectoryPage.c"
+#line 2199 "EventsDirectoryPage.c"
 }
 
 
@@ -2167,7 +2216,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 2171 "EventsDirectoryPage.c"
+#line 2220 "EventsDirectoryPage.c"
 }
 
 
@@ -2177,14 +2226,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 2181 "EventsDirectoryPage.c"
+#line 2230 "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 2188 "EventsDirectoryPage.c"
+#line 2237 "EventsDirectoryPage.c"
 }
 
 
@@ -2193,7 +2242,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 2197 "EventsDirectoryPage.c"
+#line 2246 "EventsDirectoryPage.c"
 }
 
 
@@ -2222,7 +2271,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 2226 "EventsDirectoryPage.c"
+#line 2275 "EventsDirectoryPage.c"
 }
 
 
@@ -2230,19 +2279,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2246 "EventsDirectoryPage.c"
+#line 2295 "EventsDirectoryPage.c"
 }
 
 
@@ -2288,7 +2337,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 2292 "EventsDirectoryPage.c"
+#line 2341 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2314,11 +2363,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 2318 "EventsDirectoryPage.c"
+#line 2367 "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 2322 "EventsDirectoryPage.c"
+#line 2371 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2330,11 +2379,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 2334 "EventsDirectoryPage.c"
+#line 2383 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2338 "EventsDirectoryPage.c"
+#line 2387 "EventsDirectoryPage.c"
 			{
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -2353,7 +2402,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 2357 "EventsDirectoryPage.c"
+#line 2406 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2364,7 +2413,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 2368 "EventsDirectoryPage.c"
+#line 2417 "EventsDirectoryPage.c"
 }
 
 
@@ -2374,14 +2423,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 2378 "EventsDirectoryPage.c"
+#line 2427 "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 2385 "EventsDirectoryPage.c"
+#line 2434 "EventsDirectoryPage.c"
 }
 
 
@@ -2392,7 +2441,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 2396 "EventsDirectoryPage.c"
+#line 2445 "EventsDirectoryPage.c"
 }
 
 
@@ -2422,6 +2471,8 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((PageClass *) klass)->add_actions = events_directory_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	((PageClass *) klass)->remove_actions = events_directory_page_real_remove_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"
 	((PageClass *) klass)->update_actions = events_directory_page_real_update_actions;
@@ -2435,7 +2486,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 2439 "EventsDirectoryPage.c"
+#line 2490 "EventsDirectoryPage.c"
 }
 
 
@@ -2447,7 +2498,7 @@ 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 2451 "EventsDirectoryPage.c"
+#line 2502 "EventsDirectoryPage.c"
 }
 
 
@@ -2469,7 +2520,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	if (_tmp1_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2473 "EventsDirectoryPage.c"
+#line 2524 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2491,7 +2542,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 2495 "EventsDirectoryPage.c"
+#line 2546 "EventsDirectoryPage.c"
 }
 
 
@@ -2514,39 +2565,39 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	EventSourceCollection* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_event_directory_manager_new ();
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = event_global;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection));
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/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 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_view_manager_unref0 (_tmp1_);
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2536 "EventsDirectoryPage.c"
+#line 2587 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2543 "EventsDirectoryPage.c"
+#line 2594 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
-#line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2550 "EventsDirectoryPage.c"
+#line 2601 "EventsDirectoryPage.c"
 }
 
 
@@ -2590,37 +2641,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2624 "EventsDirectoryPage.c"
+#line 2675 "EventsDirectoryPage.c"
 }
 
 
@@ -2633,71 +2684,71 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	struct tm _tmp7_ = {0};
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2643 "EventsDirectoryPage.c"
+#line 2694 "EventsDirectoryPage.c"
 		gchar* _tmp1_ = NULL;
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2651 "EventsDirectoryPage.c"
+#line 2702 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp3_ = type;
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2662 "EventsDirectoryPage.c"
+#line 2713 "EventsDirectoryPage.c"
 		} else {
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2666 "EventsDirectoryPage.c"
+#line 2717 "EventsDirectoryPage.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2674 "EventsDirectoryPage.c"
+#line 2725 "EventsDirectoryPage.c"
 	}
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = type;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = *time;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_);
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/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 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_view_manager_unref0 (_tmp9_);
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (page_name);
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2694 "EventsDirectoryPage.c"
+#line 2745 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2701 "EventsDirectoryPage.c"
+#line 2752 "EventsDirectoryPage.c"
 }
 
 
@@ -2705,17 +2756,17 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/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 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2719 "EventsDirectoryPage.c"
+#line 2770 "EventsDirectoryPage.c"
 }
 
 
@@ -2723,17 +2774,17 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/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 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2737 "EventsDirectoryPage.c"
+#line 2788 "EventsDirectoryPage.c"
 }
 
 
@@ -2741,17 +2792,17 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	SubEventsDirectoryPageDirectoryType result = 0;
 	ViewManager* _tmp0_ = NULL;
 	SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
-#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/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 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2755 "EventsDirectoryPage.c"
+#line 2806 "EventsDirectoryPage.c"
 }
 
 
@@ -2761,60 +2812,60 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
 	struct tm _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type);
-#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2773 "EventsDirectoryPage.c"
+#line 2824 "EventsDirectoryPage.c"
 		struct tm _tmp1_ = {0};
 		gint _tmp2_ = 0;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = *time;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _tmp1_.tm_mon;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2782 "EventsDirectoryPage.c"
+#line 2833 "EventsDirectoryPage.c"
 	}
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->type = _tmp3_;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = *time;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_.tm_year;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = _tmp5_;
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2796 "EventsDirectoryPage.c"
+#line 2847 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/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 2803 "EventsDirectoryPage.c"
+#line 2854 "EventsDirectoryPage.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 2818 "EventsDirectoryPage.c"
+#line 2869 "EventsDirectoryPage.c"
 }
 
 
@@ -2833,162 +2884,162 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	struct tm _tmp7_ = {0};
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/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 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = source;
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/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 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (!_tmp1_) {
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2851 "EventsDirectoryPage.c"
+#line 2902 "EventsDirectoryPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource));
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp3_;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = event_source_get_start_time (_tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_time_local (_tmp5_, &_tmp6_);
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event_time = _tmp6_;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = event_time;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = _tmp7_.tm_year;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = self->priv->year;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2875 "EventsDirectoryPage.c"
+#line 2926 "EventsDirectoryPage.c"
 		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2881 "EventsDirectoryPage.c"
+#line 2932 "EventsDirectoryPage.c"
 			struct tm _tmp11_ = {0};
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp11_ = event_time;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp12_ = _tmp11_.tm_mon;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp13_ = self->priv->month;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			result = _tmp12_ == _tmp13_;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_g_object_unref0 (event);
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2897 "EventsDirectoryPage.c"
+#line 2948 "EventsDirectoryPage.c"
 		}
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (event);
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2905 "EventsDirectoryPage.c"
+#line 2956 "EventsDirectoryPage.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2913 "EventsDirectoryPage.c"
+#line 2964 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 274 "/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 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->month;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2928 "EventsDirectoryPage.c"
+#line 2979 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 278 "/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 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->year;
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2943 "EventsDirectoryPage.c"
+#line 2994 "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 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/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 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->type;
-#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2958 "EventsDirectoryPage.c"
+#line 3009 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) {
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/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 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->finalize = sub_events_directory_page_sub_event_directory_manager_finalize;
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/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 2971 "EventsDirectoryPage.c"
+#line 3022 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) {
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self);
-#line 239 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->month = 0;
-#line 240 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 2982 "EventsDirectoryPage.c"
+#line 3033 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/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 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 2992 "EventsDirectoryPage.c"
+#line 3043 "EventsDirectoryPage.c"
 }
 
 
@@ -3005,9 +3056,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 227 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3011 "EventsDirectoryPage.c"
+#line 3062 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index af20d99..4650fd2 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -114,14 +114,21 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         { "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);
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
+        map.add_action_entries (entries, this);
 
         var display_comments = Config.Facade.get_instance().get_display_event_comments();
         get_action ("ViewComment").change_state (display_comments);
     }
 
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
     protected override void init_actions(int selected_count, int count) {
         base.init_actions(selected_count, count);
         
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index d44aff9..f5962f6 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -998,7 +998,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	file = _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp2_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	elements = _tmp2_;
 #line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1497,7 +1497,7 @@ static void folders_branch_instance_init (FoldersBranch * self) {
 #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv = FOLDERS_BRANCH_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->entries = _tmp0_;
 #line 1504 "Branch.c"
@@ -1982,7 +1982,7 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index d9af95a..ab4c085 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.32.1, the Vala compiler
+/* Folders.c generated by valac 0.34.4, the Vala compiler
  * generated from Folders.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/folders/Page.c b/src/folders/Page.c
index 03bbd48..c451234 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.32.1, the Vala compiler
+/* Page.c generated by valac 0.34.4, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 
 
 #define TYPE_PAGE (page_get_type ())
@@ -380,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -705,7 +706,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 709 "Page.c"
+#line 710 "Page.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_ = NULL;
@@ -734,7 +735,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 738 "Page.c"
+#line 739 "Page.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -754,7 +755,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 			if (!_tmp12_) {
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 				break;
-#line 758 "Page.c"
+#line 759 "Page.c"
 			}
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 			_tmp13_ = _sources_it;
@@ -780,22 +781,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 784 "Page.c"
+#line 785 "Page.c"
 		}
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		_g_object_unref0 (_sources_it);
-#line 788 "Page.c"
+#line 789 "Page.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return self;
-#line 792 "Page.c"
+#line 793 "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 799 "Page.c"
+#line 800 "Page.c"
 }
 
 
@@ -825,13 +826,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 829 "Page.c"
+#line 830 "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 835 "Page.c"
+#line 836 "Page.c"
 	}
 }
 
@@ -856,14 +857,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 860 "Page.c"
+#line 861 "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 867 "Page.c"
+#line 868 "Page.c"
 }
 
 
@@ -890,14 +891,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 894 "Page.c"
+#line 895 "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 901 "Page.c"
+#line 902 "Page.c"
 }
 
 
@@ -932,7 +933,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 936 "Page.c"
+#line 937 "Page.c"
 }
 
 
@@ -943,7 +944,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 947 "Page.c"
+#line 948 "Page.c"
 }
 
 
@@ -959,7 +960,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 963 "Page.c"
+#line 964 "Page.c"
 }
 
 
@@ -986,14 +987,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 990 "Page.c"
+#line 991 "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 997 "Page.c"
+#line 998 "Page.c"
 }
 
 
@@ -1005,7 +1006,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 1009 "Page.c"
+#line 1010 "Page.c"
 }
 
 
diff --git a/src/library/Branch.c b/src/library/Branch.c
index e7131b0..be0fedc 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -14,8 +14,8 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gee.h>
 #include <gio/gio.h>
+#include <gee.h>
 
 
 #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ())
@@ -624,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -990,35 +991,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 994 "Branch.c"
+#line 995 "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 1001 "Branch.c"
+#line 1002 "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 1008 "Branch.c"
+#line 1009 "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 1015 "Branch.c"
+#line 1016 "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 1022 "Branch.c"
+#line 1023 "Branch.c"
 }
 
 
@@ -1137,14 +1138,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 1141 "Branch.c"
+#line 1142 "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 1148 "Branch.c"
+#line 1149 "Branch.c"
 }
 
 
@@ -1174,7 +1175,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 1178 "Branch.c"
+#line 1179 "Branch.c"
 }
 
 
@@ -1186,7 +1187,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 1190 "Branch.c"
+#line 1191 "Branch.c"
 }
 
 
@@ -1198,7 +1199,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 1202 "Branch.c"
+#line 1203 "Branch.c"
 }
 
 
@@ -1210,7 +1211,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 1214 "Branch.c"
+#line 1215 "Branch.c"
 }
 
 
@@ -1222,7 +1223,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 1226 "Branch.c"
+#line 1227 "Branch.c"
 }
 
 
@@ -1242,7 +1243,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 1246 "Branch.c"
+#line 1247 "Branch.c"
 		LibraryHideablePageEntry* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1251,7 +1252,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 1255 "Branch.c"
+#line 1256 "Branch.c"
 			LibraryHideablePageEntry* _tmp5_ = NULL;
 			gint _tmp6_ = 0;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1260,7 +1261,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 1264 "Branch.c"
+#line 1265 "Branch.c"
 		}
 	} else {
 		LibraryHideablePageEntry* _tmp7_ = NULL;
@@ -1271,13 +1272,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 1275 "Branch.c"
+#line 1276 "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 1281 "Branch.c"
+#line 1282 "Branch.c"
 		}
 	}
 }
@@ -1305,7 +1306,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 1309 "Branch.c"
+#line 1310 "Branch.c"
 }
 
 
@@ -1320,14 +1321,14 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1324 "Branch.c"
+#line 1325 "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 1331 "Branch.c"
+#line 1332 "Branch.c"
 }
 
 
@@ -1346,7 +1347,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 1350 "Branch.c"
+#line 1351 "Branch.c"
 }
 
 
@@ -1361,7 +1362,7 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1365 "Branch.c"
+#line 1366 "Branch.c"
 }
 
 
@@ -1380,7 +1381,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 1384 "Branch.c"
+#line 1385 "Branch.c"
 }
 
 
@@ -1395,7 +1396,7 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1399 "Branch.c"
+#line 1400 "Branch.c"
 }
 
 
@@ -1414,7 +1415,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 1418 "Branch.c"
+#line 1419 "Branch.c"
 }
 
 
@@ -1429,7 +1430,7 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr
 	result = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1433 "Branch.c"
+#line 1434 "Branch.c"
 }
 
 
@@ -1448,7 +1449,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 1452 "Branch.c"
+#line 1453 "Branch.c"
 }
 
 
@@ -1463,7 +1464,7 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1467 "Branch.c"
+#line 1468 "Branch.c"
 }
 
 
@@ -1482,7 +1483,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 1486 "Branch.c"
+#line 1487 "Branch.c"
 }
 
 
@@ -1497,7 +1498,7 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1501 "Branch.c"
+#line 1502 "Branch.c"
 }
 
 
@@ -1516,7 +1517,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 1520 "Branch.c"
+#line 1521 "Branch.c"
 }
 
 
@@ -1543,14 +1544,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 1547 "Branch.c"
+#line 1548 "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 1554 "Branch.c"
+#line 1555 "Branch.c"
 }
 
 
@@ -1572,7 +1573,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 1576 "Branch.c"
+#line 1577 "Branch.c"
 }
 
 
@@ -1629,13 +1630,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 1633 "Branch.c"
+#line 1634 "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 1639 "Branch.c"
+#line 1640 "Branch.c"
 	}
 }
 
@@ -1681,13 +1682,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 1685 "Branch.c"
+#line 1686 "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 1691 "Branch.c"
+#line 1692 "Branch.c"
 	}
 }
 
@@ -1698,14 +1699,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 1702 "Branch.c"
+#line 1703 "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 1709 "Branch.c"
+#line 1710 "Branch.c"
 }
 
 
@@ -1724,7 +1725,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 1728 "Branch.c"
+#line 1729 "Branch.c"
 }
 
 
@@ -1740,7 +1741,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 1744 "Branch.c"
+#line 1745 "Branch.c"
 }
 
 
@@ -1758,7 +1759,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 1762 "Branch.c"
+#line 1763 "Branch.c"
 }
 
 
@@ -1771,7 +1772,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 1775 "Branch.c"
+#line 1776 "Branch.c"
 }
 
 
@@ -1797,7 +1798,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 1801 "Branch.c"
+#line 1802 "Branch.c"
 }
 
 
@@ -1812,7 +1813,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 1816 "Branch.c"
+#line 1817 "Branch.c"
 }
 
 
@@ -1831,7 +1832,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 1835 "Branch.c"
+#line 1836 "Branch.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp2_ = value;
@@ -1843,7 +1844,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 1847 "Branch.c"
+#line 1848 "Branch.c"
 }
 
 
@@ -1862,7 +1863,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 1866 "Branch.c"
+#line 1867 "Branch.c"
 }
 
 
@@ -1871,7 +1872,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 1875 "Branch.c"
+#line 1876 "Branch.c"
 }
 
 
@@ -1881,7 +1882,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 1885 "Branch.c"
+#line 1886 "Branch.c"
 }
 
 
@@ -1908,13 +1909,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 1912 "Branch.c"
+#line 1913 "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 1918 "Branch.c"
+#line 1919 "Branch.c"
 	}
 }
 
@@ -1930,13 +1931,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 1934 "Branch.c"
+#line 1935 "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 1940 "Branch.c"
+#line 1941 "Branch.c"
 	}
 }
 
@@ -1945,7 +1946,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 1949 "Branch.c"
+#line 1950 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -1974,7 +1975,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 1978 "Branch.c"
+#line 1979 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -1997,7 +1998,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			if (!_tmp7_) {
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 				break;
-#line 2001 "Branch.c"
+#line 2002 "Branch.c"
 			}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp8_ = _sources_it;
@@ -2031,22 +2032,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 2035 "Branch.c"
+#line 2036 "Branch.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2039 "Branch.c"
+#line 2040 "Branch.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 2043 "Branch.c"
+#line 2044 "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 2050 "Branch.c"
+#line 2051 "Branch.c"
 }
 
 
@@ -2076,13 +2077,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 2080 "Branch.c"
+#line 2081 "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 2086 "Branch.c"
+#line 2087 "Branch.c"
 	}
 }
 
@@ -2107,7 +2108,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 2111 "Branch.c"
+#line 2112 "Branch.c"
 }
 
 
@@ -2118,7 +2119,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 2122 "Branch.c"
+#line 2123 "Branch.c"
 }
 
 
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 16cef0f..09dafd0 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.32.1, the Vala compiler
+/* FlaggedPage.c generated by valac 0.34.4, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -427,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -822,7 +823,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 826 "FlaggedPage.c"
+#line 827 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp1_ = NULL;
@@ -851,7 +852,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 		_sources_it = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
-#line 855 "FlaggedPage.c"
+#line 856 "FlaggedPage.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -872,7 +873,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 			if (!_tmp8_) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 				break;
-#line 876 "FlaggedPage.c"
+#line 877 "FlaggedPage.c"
 			}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp9_ = _sources_it;
@@ -900,22 +901,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 904 "FlaggedPage.c"
+#line 905 "FlaggedPage.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 908 "FlaggedPage.c"
+#line 909 "FlaggedPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 912 "FlaggedPage.c"
+#line 913 "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 919 "FlaggedPage.c"
+#line 920 "FlaggedPage.c"
 }
 
 
@@ -945,13 +946,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 949 "FlaggedPage.c"
+#line 950 "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 955 "FlaggedPage.c"
+#line 956 "FlaggedPage.c"
 	}
 }
 
@@ -976,14 +977,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 980 "FlaggedPage.c"
+#line 981 "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 987 "FlaggedPage.c"
+#line 988 "FlaggedPage.c"
 }
 
 
@@ -1002,7 +1003,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 1006 "FlaggedPage.c"
+#line 1007 "FlaggedPage.c"
 }
 
 
@@ -1017,21 +1018,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 1021 "FlaggedPage.c"
+#line 1022 "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 1028 "FlaggedPage.c"
+#line 1029 "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 1035 "FlaggedPage.c"
+#line 1036 "FlaggedPage.c"
 }
 
 
@@ -1057,7 +1058,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 1061 "FlaggedPage.c"
+#line 1062 "FlaggedPage.c"
 		Flaggable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1066,11 +1067,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 1070 "FlaggedPage.c"
+#line 1071 "FlaggedPage.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp2_ = FALSE;
-#line 1074 "FlaggedPage.c"
+#line 1075 "FlaggedPage.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	result = _tmp2_;
@@ -1078,7 +1079,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 1082 "FlaggedPage.c"
+#line 1083 "FlaggedPage.c"
 }
 
 
@@ -1087,7 +1088,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 1091 "FlaggedPage.c"
+#line 1092 "FlaggedPage.c"
 }
 
 
@@ -1116,7 +1117,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 1120 "FlaggedPage.c"
+#line 1121 "FlaggedPage.c"
 }
 
 
@@ -1126,14 +1127,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 1130 "FlaggedPage.c"
+#line 1131 "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 1137 "FlaggedPage.c"
+#line 1138 "FlaggedPage.c"
 }
 
 
@@ -1142,7 +1143,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 1146 "FlaggedPage.c"
+#line 1147 "FlaggedPage.c"
 }
 
 
@@ -1175,7 +1176,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 1179 "FlaggedPage.c"
+#line 1180 "FlaggedPage.c"
 }
 
 
@@ -1192,7 +1193,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 1196 "FlaggedPage.c"
+#line 1197 "FlaggedPage.c"
 }
 
 
@@ -1208,7 +1209,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 1212 "FlaggedPage.c"
+#line 1213 "FlaggedPage.c"
 }
 
 
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 7eb90aa..5ed7427 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.34.4, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index b46e179..b64083a 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.32.1, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,12 +12,12 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
 #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>
@@ -112,16 +112,6 @@ 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))
@@ -184,6 +174,16 @@ 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 ())
@@ -322,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -468,10 +469,10 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 GtkToolbar* page_get_toolbar (Page* self);
 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 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);
+static void import_queue_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void import_queue_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -508,6 +509,8 @@ 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);
@@ -549,7 +552,7 @@ static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue
 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"
+#line 556 "ImportQueuePage.c"
 }
 
 
@@ -621,14 +624,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 625 "ImportQueuePage.c"
+#line 628 "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 632 "ImportQueuePage.c"
+#line 635 "ImportQueuePage.c"
 }
 
 
@@ -648,69 +651,116 @@ 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 652 "ImportQueuePage.c"
+#line 655 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_real_add_actions (Page* base) {
+static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
 	ImportQueuePage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _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 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	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"
-	_tmp0_ = app_window_get_instance ();
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	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), _tmp0_);
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	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);
+	_tmp1_ = map;
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 672 "ImportQueuePage.c"
+	g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
+#line 675 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
+static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) {
+	ImportQueuePage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
+#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	_tmp0_ = map;
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+#line 690 "ImportQueuePage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+		entry_collection = IMPORT_QUEUE_PAGE_entries;
+#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries);
+#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) {
+#line 702 "ImportQueuePage.c"
+			GActionEntry entry = {0};
+#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+			entry = entry_collection[entry_it];
+#line 706 "ImportQueuePage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+				_tmp1_ = map;
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+				_tmp2_ = entry;
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+				_tmp3_ = _tmp2_.name;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 719 "ImportQueuePage.c"
+			}
+		}
+	}
+}
+
+
+static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
+#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_starting ((ImportQueuePage*) self, _sender);
-#line 679 "ImportQueuePage.c"
+#line 729 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
-#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_preparing ((ImportQueuePage*) self);
-#line 686 "ImportQueuePage.c"
+#line 736 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
-#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes);
-#line 693 "ImportQueuePage.c"
+#line 743 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) {
-#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow);
-#line 700 "ImportQueuePage.c"
+#line 750 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll);
-#line 707 "ImportQueuePage.c"
+#line 757 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) {
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message);
-#line 714 "ImportQueuePage.c"
+#line 764 "ImportQueuePage.c"
 }
 
 
@@ -731,86 +781,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	GeeArrayList* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = batch_import;
-#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/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 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (!_tmp2_, "!queue.contains(batch_import)");
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = batch_import;
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 82 "/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 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = batch_import;
-#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/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 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = batch_import;
-#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 84 "/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 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp6_ = batch_import;
-#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/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 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = batch_import;
-#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 86 "/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 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp8_ = batch_import;
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 87 "/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 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = allow_user_cancel;
-#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp9_) {
-#line 775 "ImportQueuePage.c"
+#line 825 "ImportQueuePage.c"
 		GeeHashSet* _tmp10_ = NULL;
 		BatchImport* _tmp11_ = NULL;
-#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = self->priv->cancel_unallowed;
-#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = batch_import;
-#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 90 "/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 784 "ImportQueuePage.c"
+#line 834 "ImportQueuePage.c"
 	}
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = self->priv->queue;
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp13_ = batch_import;
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 92 "/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 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
-#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_emit_by_name (self, "batch-added", _tmp14_);
-#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
-#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/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 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = _tmp16_;
-#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp17_ == 1) {
-#line 804 "ImportQueuePage.c"
+#line 854 "ImportQueuePage.c"
 		BatchImport* _tmp18_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = batch_import;
-#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp18_);
-#line 810 "ImportQueuePage.c"
+#line 860 "ImportQueuePage.c"
 	}
-#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 814 "ImportQueuePage.c"
+#line 864 "ImportQueuePage.c"
 }
 
 
@@ -819,19 +869,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	GeeArrayList* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0);
-#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/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 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
-#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	result = _tmp2_;
-#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return result;
-#line 835 "ImportQueuePage.c"
+#line 885 "ImportQueuePage.c"
 }
 
 
@@ -840,44 +890,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	GeeHashSet* _tmp1_ = NULL;
 	BatchImport* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = self->priv->cancel_unallowed;
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->current_batch;
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/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 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp3_) {
-#line 854 "ImportQueuePage.c"
+#line 904 "ImportQueuePage.c"
 		GeeArrayList* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/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 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _tmp5_;
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 866 "ImportQueuePage.c"
+#line 916 "ImportQueuePage.c"
 	} else {
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = FALSE;
-#line 870 "ImportQueuePage.c"
+#line 920 "ImportQueuePage.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_);
-#line 874 "ImportQueuePage.c"
+#line 924 "ImportQueuePage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 881 "ImportQueuePage.c"
+#line 931 "ImportQueuePage.c"
 }
 
 
@@ -887,33 +937,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	gint _tmp2_ = 0;
 	AppWindow* _tmp3_ = NULL;
 	AppWindow* _tmp4_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/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 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
-#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp2_ == 0) {
-#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 905 "ImportQueuePage.c"
+#line 955 "ImportQueuePage.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
-#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = TRUE;
-#line 917 "ImportQueuePage.c"
+#line 967 "ImportQueuePage.c"
 	{
 		GeeArrayList* _batch_import_list = NULL;
 		GeeArrayList* _tmp5_ = NULL;
@@ -923,25 +973,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 		gint _batch_import_index = 0;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp5_ = self->priv->queue;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_list = _tmp6_;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp7_ = _batch_import_list;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/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 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp9_ = _tmp8_;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_size = _tmp9_;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_index = -1;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		while (TRUE) {
-#line 945 "ImportQueuePage.c"
+#line 995 "ImportQueuePage.c"
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
@@ -950,39 +1000,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			gint _tmp14_ = 0;
 			gpointer _tmp15_ = NULL;
 			BatchImport* _tmp16_ = NULL;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp10_ = _batch_import_index;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_batch_import_index = _tmp10_ + 1;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp11_ = _batch_import_index;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp12_ = _batch_import_size;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			if (!(_tmp11_ < _tmp12_)) {
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				break;
-#line 966 "ImportQueuePage.c"
+#line 1016 "ImportQueuePage.c"
 			}
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp13_ = _batch_import_list;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp14_ = _batch_import_index;
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/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 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			batch_import = (BatchImport*) _tmp15_;
-#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp16_ = batch_import;
-#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			batch_import_user_halt (_tmp16_);
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (batch_import);
-#line 982 "ImportQueuePage.c"
+#line 1032 "ImportQueuePage.c"
 		}
-#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_batch_import_list);
-#line 986 "ImportQueuePage.c"
+#line 1036 "ImportQueuePage.c"
 	}
 }
 
@@ -990,21 +1040,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 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = batch_import;
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = _tmp1_;
-#line 1008 "ImportQueuePage.c"
+#line 1058 "ImportQueuePage.c"
 }
 
 
@@ -1012,19 +1062,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkProgressBar* _tmp2_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = _ ("Preparing to import…");
-#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_pulse (_tmp2_);
-#line 1028 "ImportQueuePage.c"
+#line 1078 "ImportQueuePage.c"
 }
 
 
@@ -1034,36 +1084,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	guint64 _tmp2_ = 0ULL;
 	gdouble pct = 0.0;
 	GtkProgressBar* _tmp5_ = NULL;
-#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = completed_bytes;
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = total_bytes;
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ <= _tmp2_) {
-#line 1046 "ImportQueuePage.c"
+#line 1096 "ImportQueuePage.c"
 		guint64 _tmp3_ = 0ULL;
 		guint64 _tmp4_ = 0ULL;
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp3_ = completed_bytes;
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = total_bytes;
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_);
-#line 1055 "ImportQueuePage.c"
+#line 1105 "ImportQueuePage.c"
 	} else {
-#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = 0.0;
-#line 1059 "ImportQueuePage.c"
+#line 1109 "ImportQueuePage.c"
 	}
-#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	pct = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_fraction (_tmp5_, pct);
-#line 1067 "ImportQueuePage.c"
+#line 1117 "ImportQueuePage.c"
 }
 
 
@@ -1085,79 +1135,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	gchar* _tmp27_ = NULL;
 	gchar* _tmp28_ = NULL;
 	gchar* _tmp29_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
-#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = to_follow;
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ > 0) {
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = TRUE;
-#line 1101 "ImportQueuePage.c"
+#line 1151 "ImportQueuePage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = !_tmp2_;
-#line 1108 "ImportQueuePage.c"
+#line 1158 "ImportQueuePage.c"
 	}
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp0_) {
-#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 1114 "ImportQueuePage.c"
+#line 1164 "ImportQueuePage.c"
 	}
-#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = pixbuf;
-#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = pixbuf;
-#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	dimensions_for_pixbuf (_tmp4_, &_tmp5_);
-#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/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 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = _tmp6_;
-#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = source;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) {
-#line 1136 "ImportQueuePage.c"
+#line 1186 "ImportQueuePage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		ThumbnailSource* _tmp12_ = NULL;
 		PhotoView* _tmp13_ = NULL;
 		PhotoView* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = _tmp10_;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp12_ = source;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/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 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp14_ = _tmp13_;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/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 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp8_ = _tmp15_;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1161 "ImportQueuePage.c"
+#line 1211 "ImportQueuePage.c"
 	} else {
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
@@ -1165,51 +1215,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		VideoView* _tmp19_ = NULL;
 		VideoView* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp17_ = _tmp16_;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = source;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/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 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp20_ = _tmp19_;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/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 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp8_ = _tmp21_;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 1187 "ImportQueuePage.c"
+#line 1237 "ImportQueuePage.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp22_ = self->priv->progress_bar;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE);
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = self->priv->progress_bar;
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp24_ = _ ("Imported %s");
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp25_ = source;
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = _tmp26_;
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp28_ = g_strdup_printf (_tmp24_, _tmp27_);
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_text (_tmp23_, _tmp29_);
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_free0 (_tmp29_);
-#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_free0 (_tmp27_);
-#line 1213 "ImportQueuePage.c"
+#line 1263 "ImportQueuePage.c"
 }
 
 
@@ -1246,182 +1296,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 	gint _tmp28_ = 0;
 	gint _tmp29_ = 0;
 	BatchImport* _tmp39_ = NULL;
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = batch_import;
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = self->priv->current_batch;
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch");
-#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
-#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = NULL;
-#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->queue;
-#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/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 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
-#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp4_ > 0, "queue.size > 0");
-#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = self->priv->queue;
-#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/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 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = (BatchImport*) _tmp6_;
-#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp8_ = batch_import;
-#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import");
-#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = self->priv->queue;
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp10_ = batch_import;
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/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 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	removed = _tmp11_;
-#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = removed;
-#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp12_, "removed");
-#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp13_ = self->priv->cancel_unallowed;
-#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
-#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/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 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = batch_import;
-#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE);
-#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 174 "/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 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = batch_import;
-#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE);
-#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/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 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp19_ = batch_import;
-#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE);
-#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/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 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp21_ = batch_import;
-#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE);
-#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 177 "/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 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = batch_import;
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE);
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 178 "/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 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp25_ = batch_import;
-#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE);
-#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 179 "/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 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = self->priv->queue;
-#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 182 "/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 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
-#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp29_ > 0) {
-#line 1350 "ImportQueuePage.c"
+#line 1400 "ImportQueuePage.c"
 		GeeArrayList* _tmp30_ = NULL;
 		gpointer _tmp31_ = NULL;
 		BatchImport* _tmp32_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp30_ = self->priv->queue;
-#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 183 "/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 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp32_ = (BatchImport*) _tmp31_;
-#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp32_);
-#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp32_);
-#line 1364 "ImportQueuePage.c"
+#line 1414 "ImportQueuePage.c"
 	} else {
 		GtkProgressBar* _tmp33_ = NULL;
 		GtkProgressBar* _tmp34_ = NULL;
 		GtkProgressBar* _tmp35_ = NULL;
 		gboolean _tmp36_ = FALSE;
-#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp33_ = self->priv->progress_bar;
-#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE);
-#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp34_ = self->priv->progress_bar;
-#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gtk_progress_bar_set_text (_tmp34_, "");
-#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp35_ = self->priv->progress_bar;
-#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		gtk_progress_bar_set_fraction (_tmp35_, 0.0);
 #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+		gtk_progress_bar_set_fraction (_tmp35_, 0.0);
+#line 195 "/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 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp36_ = self->priv->stopped;
-#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		if (_tmp36_) {
-#line 1388 "ImportQueuePage.c"
+#line 1438 "ImportQueuePage.c"
 			AppWindow* _tmp37_ = NULL;
 			AppWindow* _tmp38_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp37_ = app_window_get_instance ();
-#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp38_ = _tmp37_;
-#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow));
-#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (_tmp38_);
-#line 1399 "ImportQueuePage.c"
+#line 1449 "ImportQueuePage.c"
 		}
-#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		self->priv->stopped = FALSE;
-#line 1403 "ImportQueuePage.c"
+#line 1453 "ImportQueuePage.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp39_ = batch_import;
-#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_emit_by_name (self, "batch-removed", _tmp39_);
-#line 1411 "ImportQueuePage.c"
+#line 1461 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) {
 	const gchar* _tmp0_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (message != NULL);
-#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = message;
-#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	app_window_error_message (_tmp0_, NULL);
-#line 1425 "ImportQueuePage.c"
+#line 1475 "ImportQueuePage.c"
 }
 
 
@@ -1435,12 +1485,14 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	((PageClass *) klass)->add_actions = import_queue_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	((PageClass *) klass)->remove_actions = import_queue_page_real_remove_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 1444 "ImportQueuePage.c"
+#line 1496 "ImportQueuePage.c"
 }
 
 
@@ -1468,7 +1520,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 1472 "ImportQueuePage.c"
+#line 1524 "ImportQueuePage.c"
 }
 
 
@@ -1486,7 +1538,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 1490 "ImportQueuePage.c"
+#line 1542 "ImportQueuePage.c"
 }
 
 
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index a2f2290..feb525d 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -63,12 +63,19 @@ public class ImportQueuePage : SinglePhotoPage {
         {"Stop", on_stop }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries(entries, this);
     }
-    
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
     public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) {
         assert(!queue.contains(batch_import));
         
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index 8b71718..fb038d9 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.34.4, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index fbec432..bfaa3ed 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.32.1, the Vala compiler
+/* LastImportPage.c generated by valac 0.34.4, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -385,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -708,7 +709,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 712 "LastImportPage.c"
+#line 713 "LastImportPage.c"
 }
 
 
@@ -716,7 +717,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 720 "LastImportPage.c"
+#line 721 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -745,7 +746,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 749 "LastImportPage.c"
+#line 750 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -760,7 +761,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 			if (!_tmp7_) {
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 764 "LastImportPage.c"
+#line 765 "LastImportPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -774,24 +775,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 778 "LastImportPage.c"
+#line 779 "LastImportPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 782 "LastImportPage.c"
+#line 783 "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 788 "LastImportPage.c"
+#line 789 "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 795 "LastImportPage.c"
+#line 796 "LastImportPage.c"
 }
 
 
@@ -829,7 +830,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 833 "LastImportPage.c"
+#line 834 "LastImportPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -854,7 +855,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 858 "LastImportPage.c"
+#line 859 "LastImportPage.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp9_ = current_last_import_id;
@@ -870,7 +871,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 874 "LastImportPage.c"
+#line 875 "LastImportPage.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp13_ = current_last_import_id;
@@ -892,7 +893,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 896 "LastImportPage.c"
+#line 897 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp18_ = NULL;
@@ -921,7 +922,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 925 "LastImportPage.c"
+#line 926 "LastImportPage.c"
 			GeeIterator* _tmp24_ = NULL;
 			gboolean _tmp25_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -944,7 +945,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 948 "LastImportPage.c"
+#line 949 "LastImportPage.c"
 			}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp26_ = _col_it;
@@ -978,15 +979,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 982 "LastImportPage.c"
+#line 983 "LastImportPage.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 986 "LastImportPage.c"
+#line 987 "LastImportPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_import_id_free0 (current_last_import_id);
-#line 990 "LastImportPage.c"
+#line 991 "LastImportPage.c"
 }
 
 
@@ -1016,13 +1017,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 1020 "LastImportPage.c"
+#line 1021 "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 1026 "LastImportPage.c"
+#line 1027 "LastImportPage.c"
 	}
 }
 
@@ -1047,7 +1048,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 1051 "LastImportPage.c"
+#line 1052 "LastImportPage.c"
 }
 
 
@@ -1069,14 +1070,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 1073 "LastImportPage.c"
+#line 1074 "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 1080 "LastImportPage.c"
+#line 1081 "LastImportPage.c"
 }
 
 
@@ -1106,7 +1107,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 1110 "LastImportPage.c"
+#line 1111 "LastImportPage.c"
 }
 
 
@@ -1119,14 +1120,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 1123 "LastImportPage.c"
+#line 1124 "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 1130 "LastImportPage.c"
+#line 1131 "LastImportPage.c"
 }
 
 
@@ -1136,7 +1137,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 1140 "LastImportPage.c"
+#line 1141 "LastImportPage.c"
 }
 
 
@@ -1163,7 +1164,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 1167 "LastImportPage.c"
+#line 1168 "LastImportPage.c"
 }
 
 
@@ -1177,7 +1178,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 1181 "LastImportPage.c"
+#line 1182 "LastImportPage.c"
 }
 
 
@@ -1185,7 +1186,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 1189 "LastImportPage.c"
+#line 1190 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -1214,7 +1215,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 1218 "LastImportPage.c"
+#line 1219 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -1230,7 +1231,7 @@ static void last_import_page_finalize (GObject* obj) {
 			if (!_tmp7_) {
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 1234 "LastImportPage.c"
+#line 1235 "LastImportPage.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -1246,17 +1247,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 1250 "LastImportPage.c"
+#line 1251 "LastImportPage.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 1254 "LastImportPage.c"
+#line 1255 "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 1260 "LastImportPage.c"
+#line 1261 "LastImportPage.c"
 }
 
 
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index bdf6b91..d30c4af 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.34.4, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/Library.c b/src/library/Library.c
index 4ce5d56..0e29d27 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.32.1, the Vala compiler
+/* Library.c generated by valac 0.34.4, the Vala compiler
  * generated from Library.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index e4d802b..07c30d7 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.32.1, the Vala compiler
+/* LibraryWindow.c generated by valac 0.34.4, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1084,7 +1084,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -1422,6 +1423,7 @@ GType library_photos_entry_get_type (void) G_GNUC_CONST;
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 static void library_window_load_configuration (LibraryWindow* self);
+void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
 GFile* directory_monitor_get_root (DirectoryMonitor* self);
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self);
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self);
@@ -1670,7 +1672,6 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 static void library_window_hide_background_progress_bar (LibraryWindow* self);
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self);
 gint library_window_get_PAGE_MIN_WIDTH (void);
-void application_set_appmenu (GMenuModel* model);
 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);
@@ -1729,6 +1730,7 @@ enum  {
 	LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY
 };
 static void library_window_fullscreen_photo_page_real_switched_to (Page* base);
+static void library_window_fullscreen_photo_page_real_switching_from (Page* base);
 static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 static void library_window_fullscreen_photo_page_finalize (GObject* obj);
 static void library_window_finalize (GObject* obj);
@@ -1742,86 +1744,86 @@ const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (
 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", NULL, 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", NULL, 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 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1748 "LibraryWindow.c"
+#line 1750 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1755 "LibraryWindow.c"
+#line 1757 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1762 "LibraryWindow.c"
+#line 1764 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1769 "LibraryWindow.c"
+#line 1771 "LibraryWindow.c"
 }
 
 
 static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1776 "LibraryWindow.c"
+#line 1778 "LibraryWindow.c"
 }
 
 
 static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1783 "LibraryWindow.c"
+#line 1785 "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 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1790 "LibraryWindow.c"
+#line 1792 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1797 "LibraryWindow.c"
+#line 1799 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1804 "LibraryWindow.c"
+#line 1806 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1811 "LibraryWindow.c"
+#line 1813 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1818 "LibraryWindow.c"
+#line 1820 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1825 "LibraryWindow.c"
+#line 1827 "LibraryWindow.c"
 }
 
 
@@ -1850,121 +1852,121 @@ 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 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
-#line 1856 "LibraryWindow.c"
+#line 1858 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1863 "LibraryWindow.c"
+#line 1865 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
-#line 1870 "LibraryWindow.c"
+#line 1872 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1877 "LibraryWindow.c"
+#line 1879 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1884 "LibraryWindow.c"
+#line 1886 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
-#line 1891 "LibraryWindow.c"
+#line 1893 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
-#line 1898 "LibraryWindow.c"
+#line 1900 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1905 "LibraryWindow.c"
+#line 1907 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1912 "LibraryWindow.c"
+#line 1914 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1919 "LibraryWindow.c"
+#line 1921 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1926 "LibraryWindow.c"
+#line 1928 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1933 "LibraryWindow.c"
+#line 1935 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1940 "LibraryWindow.c"
+#line 1942 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1947 "LibraryWindow.c"
+#line 1949 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1954 "LibraryWindow.c"
+#line 1956 "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 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1961 "LibraryWindow.c"
+#line 1963 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
-#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1968 "LibraryWindow.c"
+#line 1970 "LibraryWindow.c"
 }
 
 
@@ -2021,117 +2023,119 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	CameraTable* _tmp56_ = NULL;
 	CameraTable* _tmp57_ = NULL;
 	GtkProgressBar* _tmp58_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = (LibraryWindow*) app_window_construct (object_type);
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	static const gchar* accels[] = {"<Primary>f", "F8", NULL};
 #line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = (LibraryWindow*) app_window_construct (object_type);
+#line 154 "/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 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 157 "/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 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 158 "/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 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/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 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 158 "/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 160 "/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 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/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 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/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 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/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 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/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 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/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 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/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 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 170 "/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 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->extended_properties = _tmp17_;
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/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 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 170 "/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 172 "/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 174 "/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 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->library_branch;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _tmp24_;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/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 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_create_layout (self, _tmp27_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp27_);
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2135 "LibraryWindow.c"
+#line 2139 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp28_ = NULL;
@@ -2140,27 +2144,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		GeeCollection* _tmp31_ = NULL;
 		GeeIterator* _tmp32_ = NULL;
 		GeeIterator* _tmp33_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = media_collection_registry_get_all (_tmp29_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _tmp30_;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = _tmp32_;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp31_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp29_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp33_;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2164 "LibraryWindow.c"
+#line 2168 "LibraryWindow.c"
 			GeeIterator* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
@@ -2168,176 +2172,178 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 			gpointer _tmp37_ = NULL;
 			MediaSourceCollection* _tmp38_ = NULL;
 			MediaSourceCollection* _tmp39_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp35_ = gee_iterator_next (_tmp34_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp35_) {
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2180 "LibraryWindow.c"
+#line 2184 "LibraryWindow.c"
 			}
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp36_ = _media_sources_it;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp37_ = gee_iterator_get (_tmp36_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			media_sources = (MediaSourceCollection*) _tmp37_;
-#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp38_ = media_sources;
-#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/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 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp39_ = media_sources;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/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 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 2198 "LibraryWindow.c"
+#line 2202 "LibraryWindow.c"
 		}
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 2202 "LibraryWindow.c"
+#line 2206 "LibraryWindow.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = g_new0 (GtkTargetEntry, 2);
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[0] = _tmp40_;
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[1] = _tmp41_;
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = _tmp42_;
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = main_window_dnd_targets;
-#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43__length1 = main_window_dnd_targets_length1;
-#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 199 "/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 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = metadata_writer_get_instance ();
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp45_);
 #line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp45_);
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = library_monitor_pool_get_instance ();
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = _tmp46_;
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = _tmp48_;
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp47_);
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	monitor = _tmp49_;
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = monitor;
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp50_ != NULL) {
-#line 2250 "LibraryWindow.c"
+#line 2254 "LibraryWindow.c"
 		LibraryMonitor* _tmp51_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = monitor;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2256 "LibraryWindow.c"
+#line 2260 "LibraryWindow.c"
 	}
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = library_monitor_pool_get_instance ();
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = _tmp52_;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/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 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp53_);
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = library_monitor_pool_get_instance ();
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = _tmp54_;
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp55_);
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp55_);
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp56_ = camera_table_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp57_ = _tmp56_;
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/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 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_camera_table_unref0 (_tmp57_);
 #line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_camera_table_unref0 (_tmp57_);
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp58_ = self->priv->background_progress_bar;
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
-#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels));
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2292 "LibraryWindow.c"
+#line 2298 "LibraryWindow.c"
 }
 
 
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
-#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2299 "LibraryWindow.c"
+#line 2305 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2306 "LibraryWindow.c"
+#line 2312 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2313 "LibraryWindow.c"
+#line 2319 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2320 "LibraryWindow.c"
+#line 2326 "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 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2327 "LibraryWindow.c"
+#line 2333 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2334 "LibraryWindow.c"
+#line 2340 "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 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2341 "LibraryWindow.c"
+#line 2347 "LibraryWindow.c"
 }
 
 
@@ -2353,51 +2359,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 	LibraryMonitor* _tmp8_ = NULL;
 	LibraryMonitor* _tmp9_ = NULL;
 	LibraryMonitor* _tmp10_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:244: on_library_monitor_installed: %s", _tmp4_);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:250: on_library_monitor_installed: %s", _tmp4_);
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/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 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = monitor;
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/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 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/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 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = monitor;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/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 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/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 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = monitor;
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/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 2401 "LibraryWindow.c"
+#line 2407 "LibraryWindow.c"
 }
 
 
@@ -2419,84 +2425,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li
 	guint _tmp14_ = 0U;
 	LibraryMonitor* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:255: on_library_monitor_destroyed: %s", _tmp4_);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:261: on_library_monitor_destroyed: %s", _tmp4_);
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/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 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/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 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/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 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = monitor;
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 266 "/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 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = monitor;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 267 "/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 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = monitor;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 268 "/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 2479 "LibraryWindow.c"
+#line 2485 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new1 (gboolean value) {
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2486 "LibraryWindow.c"
+#line 2492 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new2 (gboolean value) {
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2493 "LibraryWindow.c"
+#line 2499 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new3 (gboolean value) {
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2500 "LibraryWindow.c"
+#line 2506 "LibraryWindow.c"
 }
 
 
@@ -2517,71 +2523,71 @@ static void library_window_real_add_actions (AppWindow* base) {
 	GAction* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
 	GVariant* _tmp14_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 293 "/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 288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 294 "/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 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_actions;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_actions;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 295 "/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 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _variant_new1 (_tmp7_);
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp4_, _tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_is_sidebar_visible (self);
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _variant_new2 (_tmp10_);
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp9_, _tmp11_);
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp11_);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = library_window_is_toolbar_visible (self);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _variant_new3 (_tmp13_);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp12_, _tmp14_);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp14_);
-#line 2571 "LibraryWindow.c"
+#line 2577 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2578 "LibraryWindow.c"
+#line 2584 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2585 "LibraryWindow.c"
+#line 2591 "LibraryWindow.c"
 }
 
 
@@ -2594,23 +2600,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	SearchFilterActions* _tmp18_ = NULL;
 	Page* _tmp19_ = NULL;
 	Page* _tmp20_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/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 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = old_page;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 2614 "LibraryWindow.c"
+#line 2620 "LibraryWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -2619,126 +2625,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = old_page;
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/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 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = old_page;
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/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 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 2647 "LibraryWindow.c"
+#line 2653 "LibraryWindow.c"
 	}
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = new_page;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 2653 "LibraryWindow.c"
+#line 2659 "LibraryWindow.c"
 		Page* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
 		Page* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = new_page;
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = page_get_view (_tmp12_);
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/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 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = new_page;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = page_get_view (_tmp15_);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/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 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 2680 "LibraryWindow.c"
+#line 2686 "LibraryWindow.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->search_actions;
-#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = old_page;
-#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = new_page;
-#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2690 "LibraryWindow.c"
+#line 2696 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2697 "LibraryWindow.c"
+#line 2703 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 320 "/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 2711 "LibraryWindow.c"
+#line 2717 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
-#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/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 2728 "LibraryWindow.c"
+#line 2734 "LibraryWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2735 "LibraryWindow.c"
+#line 2741 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new4 (gboolean value) {
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2742 "LibraryWindow.c"
+#line 2748 "LibraryWindow.c"
 }
 
 
@@ -2753,56 +2759,56 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	GAction* _tmp6_ = NULL;
 	GAction* _tmp7_ = NULL;
 	GAction* _tmp8_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/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 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = !_tmp4_;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_) {
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 2779 "LibraryWindow.c"
+#line 2785 "LibraryWindow.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 334 "/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"
+#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp7_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 2791 "LibraryWindow.c"
+#line 2797 "LibraryWindow.c"
 		GAction* _tmp9_ = NULL;
 		GVariant* _tmp10_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = action;
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _variant_new4 (TRUE);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_action_change_state (_tmp9_, _tmp10_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp10_);
-#line 2802 "LibraryWindow.c"
+#line 2808 "LibraryWindow.c"
 	}
-#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 2806 "LibraryWindow.c"
+#line 2812 "LibraryWindow.c"
 }
 
 
@@ -2826,87 +2832,87 @@ static void library_window_real_show_all (GtkWidget* base) {
 	gboolean _tmp15_ = FALSE;
 	CheckerboardPage* _tmp16_ = NULL;
 	gboolean _tmp17_ = FALSE;
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 342 "/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 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/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 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE);
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_properties_action = _tmp3_;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = basic_properties_action;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/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"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = basic_properties_action;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_get_state (_tmp5_);
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_variant_get_boolean (_tmp7_);
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = !_tmp8_;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 2864 "LibraryWindow.c"
+#line 2870 "LibraryWindow.c"
 		GtkFrame* _tmp10_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = self->priv->bottom_frame;
-#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2870 "LibraryWindow.c"
+#line 2876 "LibraryWindow.c"
 	}
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 352 "/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"
+#line 352 "/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"
+#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == NULL) {
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2880 "LibraryWindow.c"
+#line 2886 "LibraryWindow.c"
 	}
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp12_;
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = current_page;
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_ != NULL) {
-#line 2888 "LibraryWindow.c"
+#line 2894 "LibraryWindow.c"
 		CheckerboardPage* _tmp14_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, _tmp14_);
-#line 2894 "LibraryWindow.c"
+#line 2900 "LibraryWindow.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 356 "/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"
+#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = current_page;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 356 "/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"
+#line 359 "/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"
+#line 359 "/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"
+#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 2910 "LibraryWindow.c"
+#line 2916 "LibraryWindow.c"
 }
 
 
@@ -2915,77 +2921,77 @@ LibraryWindow* library_window_get_app (void) {
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
 	LibraryWindow* _tmp2_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow");
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_window_instance;
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow));
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2931 "LibraryWindow.c"
+#line 2937 "LibraryWindow.c"
 }
 
 
 gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	gboolean result = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 2939 "LibraryWindow.c"
+#line 2945 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
 		gint _scheme_collection_size_ = 0;
 		gint scheme_it = 0;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/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 2951 "LibraryWindow.c"
+#line 2957 "LibraryWindow.c"
 			gchar* _tmp0_ = NULL;
 			gchar* scheme = NULL;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 2958 "LibraryWindow.c"
+#line 2964 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_ = NULL;
 				const gchar* _tmp2_ = NULL;
 				gboolean _tmp3_ = FALSE;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = uri;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp2_ = scheme;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp3_) {
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 2977 "LibraryWindow.c"
+#line 2983 "LibraryWindow.c"
 				}
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 2981 "LibraryWindow.c"
+#line 2987 "LibraryWindow.c"
 			}
 		}
 	}
-#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2989 "LibraryWindow.c"
+#line 2995 "LibraryWindow.c"
 }
 
 
@@ -2993,15 +2999,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE);
-#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3005 "LibraryWindow.c"
+#line 3011 "LibraryWindow.c"
 }
 
 
@@ -3011,40 +3017,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_ = NULL;
 	TagsSidebarEntry* _tmp2_ = NULL;
 	TagsSidebarEntry* _tmp3_ = NULL;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3031 "LibraryWindow.c"
+#line 3037 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		TagsSidebarEntry* _tmp5_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/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 3040 "LibraryWindow.c"
+#line 3046 "LibraryWindow.c"
 	} else {
-#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:381: No tag entry found for rename");
-#line 3044 "LibraryWindow.c"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:387: No tag entry found for rename");
+#line 3050 "LibraryWindow.c"
 	}
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3048 "LibraryWindow.c"
+#line 3054 "LibraryWindow.c"
 }
 
 
@@ -3054,40 +3060,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 	Event* _tmp1_ = NULL;
 	EventsEventEntry* _tmp2_ = NULL;
 	EventsEventEntry* _tmp3_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3074 "LibraryWindow.c"
+#line 3080 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		EventsEventEntry* _tmp5_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/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 3083 "LibraryWindow.c"
+#line 3089 "LibraryWindow.c"
 	} else {
-#line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:389: No event entry found for rename");
-#line 3087 "LibraryWindow.c"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:395: No event entry found for rename");
+#line 3093 "LibraryWindow.c"
 	}
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3091 "LibraryWindow.c"
+#line 3097 "LibraryWindow.c"
 }
 
 
@@ -3097,40 +3103,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 	SavedSearch* _tmp1_ = NULL;
 	SearchesSidebarEntry* _tmp2_ = NULL;
 	SearchesSidebarEntry* _tmp3_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3117 "LibraryWindow.c"
+#line 3123 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		SearchesSidebarEntry* _tmp5_ = NULL;
-#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/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 3126 "LibraryWindow.c"
+#line 3132 "LibraryWindow.c"
 	} else {
-#line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:397: No search entry found for rename");
-#line 3130 "LibraryWindow.c"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:403: No search entry found for rename");
+#line 3136 "LibraryWindow.c"
 	}
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3134 "LibraryWindow.c"
+#line 3140 "LibraryWindow.c"
 }
 
 
@@ -3145,37 +3151,37 @@ static void library_window_real_on_quit (AppWindow* base) {
 	GtkPaned* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/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 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->client_paned;
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_paned_get_position (_tmp6_);
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/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 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/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 3179 "LibraryWindow.c"
+#line 3185 "LibraryWindow.c"
 }
 
 
@@ -3192,105 +3198,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	Photo* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
 	GeeList* _tmp12_ = NULL;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = view;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
-#line 3212 "LibraryWindow.c"
+#line 3218 "LibraryWindow.c"
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp6_;
-#line 3223 "LibraryWindow.c"
+#line 3229 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp8_;
-#line 3235 "LibraryWindow.c"
+#line 3241 "LibraryWindow.c"
 	}
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp2_);
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sources = _tmp9_;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = sources;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
-#line 3245 "LibraryWindow.c"
+#line 3251 "LibraryWindow.c"
 		GeeList* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = sources;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp15_ != 0;
-#line 3257 "LibraryWindow.c"
+#line 3263 "LibraryWindow.c"
 	} else {
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
-#line 3261 "LibraryWindow.c"
+#line 3267 "LibraryWindow.c"
 	}
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
-#line 3265 "LibraryWindow.c"
+#line 3271 "LibraryWindow.c"
 		GeeList* _tmp16_ = NULL;
 		gpointer _tmp17_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sources;
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = gee_list_get (_tmp16_, 0);
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3276 "LibraryWindow.c"
+#line 3282 "LibraryWindow.c"
 	} else {
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = NULL;
-#line 3282 "LibraryWindow.c"
+#line 3288 "LibraryWindow.c"
 	}
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp10_;
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3294 "LibraryWindow.c"
+#line 3300 "LibraryWindow.c"
 }
 
 
@@ -3302,27 +3308,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	Page* _tmp0_ = NULL;
 	Page* _tmp8_ = NULL;
 	Page* _tmp30_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), FALSE);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_collection);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_collection = NULL;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_start);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_start = NULL;
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_vala_view_collection);
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3326 "LibraryWindow.c"
+#line 3332 "LibraryWindow.c"
 		Page* _tmp1_ = NULL;
 		CollectionPage* _tmp2_ = NULL;
 		Photo* photo = NULL;
@@ -3331,117 +3337,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp5_ = NULL;
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = page;
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_collection = _tmp2_;
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _vala_collection;
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo = _tmp4_;
-#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = photo;
-#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp5_ == NULL) {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3361 "LibraryWindow.c"
+#line 3367 "LibraryWindow.c"
 			} else {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3365 "LibraryWindow.c"
+#line 3371 "LibraryWindow.c"
 			}
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3371 "LibraryWindow.c"
+#line 3377 "LibraryWindow.c"
 			} else {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3375 "LibraryWindow.c"
+#line 3381 "LibraryWindow.c"
 			}
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3381 "LibraryWindow.c"
+#line 3387 "LibraryWindow.c"
 			} else {
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3385 "LibraryWindow.c"
+#line 3391 "LibraryWindow.c"
 			}
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3389 "LibraryWindow.c"
+#line 3395 "LibraryWindow.c"
 		}
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = photo;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp7_;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3411 "LibraryWindow.c"
+#line 3417 "LibraryWindow.c"
 		} else {
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3415 "LibraryWindow.c"
+#line 3421 "LibraryWindow.c"
 		}
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3421 "LibraryWindow.c"
+#line 3427 "LibraryWindow.c"
 		} else {
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3425 "LibraryWindow.c"
+#line 3431 "LibraryWindow.c"
 		}
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3431 "LibraryWindow.c"
+#line 3437 "LibraryWindow.c"
 		} else {
-#line 437 "/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 3435 "LibraryWindow.c"
+#line 3441 "LibraryWindow.c"
 		}
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3439 "LibraryWindow.c"
+#line 3445 "LibraryWindow.c"
 	}
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page;
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3445 "LibraryWindow.c"
+#line 3451 "LibraryWindow.c"
 		ViewCollection* view = NULL;
 		Page* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
@@ -3467,291 +3473,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		Photo* _tmp29_ = NULL;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_get_view (_tmp9_);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view = _tmp10_;
-#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = view;
-#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp12_ == 0) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3491 "LibraryWindow.c"
+#line 3497 "LibraryWindow.c"
 			} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3495 "LibraryWindow.c"
+#line 3501 "LibraryWindow.c"
 			}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3501 "LibraryWindow.c"
+#line 3507 "LibraryWindow.c"
 			} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3505 "LibraryWindow.c"
+#line 3511 "LibraryWindow.c"
 			}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3511 "LibraryWindow.c"
+#line 3517 "LibraryWindow.c"
 			} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3515 "LibraryWindow.c"
+#line 3521 "LibraryWindow.c"
 			}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3519 "LibraryWindow.c"
+#line 3525 "LibraryWindow.c"
 		}
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = view;
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/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 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = data_view_get_source (_tmp15_);
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		event = _tmp17_;
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = event;
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp18_ == NULL) {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3549 "LibraryWindow.c"
+#line 3555 "LibraryWindow.c"
 			} else {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3553 "LibraryWindow.c"
+#line 3559 "LibraryWindow.c"
 			}
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3559 "LibraryWindow.c"
+#line 3565 "LibraryWindow.c"
 			} else {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3563 "LibraryWindow.c"
+#line 3569 "LibraryWindow.c"
 			}
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3569 "LibraryWindow.c"
+#line 3575 "LibraryWindow.c"
 			} else {
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3573 "LibraryWindow.c"
+#line 3579 "LibraryWindow.c"
 			}
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3577 "LibraryWindow.c"
+#line 3583 "LibraryWindow.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = event;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		entry = _tmp21_;
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = entry;
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp22_ == NULL) {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3603 "LibraryWindow.c"
+#line 3609 "LibraryWindow.c"
 			} else {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3607 "LibraryWindow.c"
+#line 3613 "LibraryWindow.c"
 			}
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3613 "LibraryWindow.c"
+#line 3619 "LibraryWindow.c"
 			} else {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3617 "LibraryWindow.c"
+#line 3623 "LibraryWindow.c"
 			}
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3623 "LibraryWindow.c"
+#line 3629 "LibraryWindow.c"
 			} else {
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3627 "LibraryWindow.c"
+#line 3633 "LibraryWindow.c"
 			}
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3631 "LibraryWindow.c"
+#line 3637 "LibraryWindow.c"
 		}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = entry;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/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 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/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 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = _vala_collection;
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo = _tmp26_;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = photo;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp27_ == NULL) {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3665 "LibraryWindow.c"
+#line 3671 "LibraryWindow.c"
 			} else {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3669 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 			}
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3675 "LibraryWindow.c"
+#line 3681 "LibraryWindow.c"
 			} else {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3679 "LibraryWindow.c"
+#line 3685 "LibraryWindow.c"
 			}
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3685 "LibraryWindow.c"
+#line 3691 "LibraryWindow.c"
 			} else {
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3689 "LibraryWindow.c"
+#line 3695 "LibraryWindow.c"
 			}
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3693 "LibraryWindow.c"
+#line 3699 "LibraryWindow.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = photo;
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp29_;
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (event);
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3721 "LibraryWindow.c"
+#line 3727 "LibraryWindow.c"
 		} else {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3725 "LibraryWindow.c"
+#line 3731 "LibraryWindow.c"
 		}
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3731 "LibraryWindow.c"
+#line 3737 "LibraryWindow.c"
 		} else {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3735 "LibraryWindow.c"
+#line 3741 "LibraryWindow.c"
 		}
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3741 "LibraryWindow.c"
+#line 3747 "LibraryWindow.c"
 		} else {
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3745 "LibraryWindow.c"
+#line 3751 "LibraryWindow.c"
 		}
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3749 "LibraryWindow.c"
+#line 3755 "LibraryWindow.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = page;
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3755 "LibraryWindow.c"
+#line 3761 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp31_ = NULL;
 		LibraryPhotoPage* _tmp32_ = NULL;
@@ -3767,207 +3773,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp41_ = NULL;
 		LibraryPhotoPage* _tmp42_ = NULL;
 		ViewCollection* _tmp43_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = page;
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo_page = _tmp32_;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = photo_page;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp34_ = library_photo_page_get_controller_page (_tmp33_);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		controller = _tmp34_;
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = controller;
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp35_ == NULL) {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3797 "LibraryWindow.c"
+#line 3803 "LibraryWindow.c"
 			} else {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3801 "LibraryWindow.c"
+#line 3807 "LibraryWindow.c"
 			}
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3807 "LibraryWindow.c"
+#line 3813 "LibraryWindow.c"
 			} else {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3811 "LibraryWindow.c"
+#line 3817 "LibraryWindow.c"
 			}
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3817 "LibraryWindow.c"
+#line 3823 "LibraryWindow.c"
 			} else {
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3821 "LibraryWindow.c"
+#line 3827 "LibraryWindow.c"
 			}
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3825 "LibraryWindow.c"
+#line 3831 "LibraryWindow.c"
 		}
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = photo_page;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/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 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp37_) {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3843 "LibraryWindow.c"
+#line 3849 "LibraryWindow.c"
 			} else {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3847 "LibraryWindow.c"
+#line 3853 "LibraryWindow.c"
 			}
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3853 "LibraryWindow.c"
+#line 3859 "LibraryWindow.c"
 			} else {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3857 "LibraryWindow.c"
+#line 3863 "LibraryWindow.c"
 			}
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3863 "LibraryWindow.c"
+#line 3869 "LibraryWindow.c"
 			} else {
-#line 472 "/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 3867 "LibraryWindow.c"
+#line 3873 "LibraryWindow.c"
 			}
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3871 "LibraryWindow.c"
+#line 3877 "LibraryWindow.c"
 		}
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = controller;
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_collection = _tmp39_;
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp40_ = photo_page;
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/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 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp41_;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp42_ = photo_page;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = _tmp43_;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (controller);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo_page);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3907 "LibraryWindow.c"
+#line 3913 "LibraryWindow.c"
 		} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3911 "LibraryWindow.c"
+#line 3917 "LibraryWindow.c"
 		}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3917 "LibraryWindow.c"
+#line 3923 "LibraryWindow.c"
 		} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3921 "LibraryWindow.c"
+#line 3927 "LibraryWindow.c"
 		}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3927 "LibraryWindow.c"
+#line 3933 "LibraryWindow.c"
 		} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3931 "LibraryWindow.c"
+#line 3937 "LibraryWindow.c"
 		}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3935 "LibraryWindow.c"
+#line 3941 "LibraryWindow.c"
 	}
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (collection) {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 3943 "LibraryWindow.c"
+#line 3949 "LibraryWindow.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 3947 "LibraryWindow.c"
+#line 3953 "LibraryWindow.c"
 	}
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 3953 "LibraryWindow.c"
+#line 3959 "LibraryWindow.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 3957 "LibraryWindow.c"
+#line 3963 "LibraryWindow.c"
 	}
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 3963 "LibraryWindow.c"
+#line 3969 "LibraryWindow.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 3967 "LibraryWindow.c"
+#line 3973 "LibraryWindow.c"
 	}
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3971 "LibraryWindow.c"
+#line 3977 "LibraryWindow.c"
 }
 
 
@@ -3990,97 +3996,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	ViewCollection* _tmp9_ = NULL;
 	LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL;
 	LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL;
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/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 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp0_;
-#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = current_page;
-#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4008 "LibraryWindow.c"
+#line 4014 "LibraryWindow.c"
 	}
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = NULL;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = current_page;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_);
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp3_;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp4_;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp5_;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp6_) {
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (start);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (collection);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4040 "LibraryWindow.c"
+#line 4046 "LibraryWindow.c"
 	}
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = start;
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = view;
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_);
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fs_photo = _tmp10_;
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = fs_photo;
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/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 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (fs_photo);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 4068 "LibraryWindow.c"
+#line 4074 "LibraryWindow.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 4075 "LibraryWindow.c"
+#line 4081 "LibraryWindow.c"
 }
 
 
 static void _g_slist_free__g_free0_ (GSList* self) {
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free (self);
-#line 4084 "LibraryWindow.c"
+#line 4090 "LibraryWindow.c"
 }
 
 
@@ -4099,41 +4105,41 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	GtkFileChooserDialog* _tmp23_ = NULL;
 	gchar* _tmp24_ = NULL;
 	GtkFileChooserDialog* _tmp25_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Import From Folder");
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 507 "/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 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp1_);
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = _tmp1_;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 510 "/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 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
-#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 511 "/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 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = import_dialog;
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->import_dir;
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 512 "/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 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = import_dialog;
-#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog));
-#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	response = _tmp7_;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = response;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4137 "LibraryWindow.c"
+#line 4143 "LibraryWindow.c"
 		GtkResponseType _tmp9_ = 0;
 		GtkFileChooserDialog* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
@@ -4144,95 +4150,95 @@ static void library_window_on_file_import (LibraryWindow* self) {
 		gboolean _tmp16_ = FALSE;
 		GtkResponseType copy_files_response = 0;
 		GtkResponseType _tmp18_ = 0;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = import_dialog;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/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 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp14_);
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp12_);
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp16_) {
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = GTK_RESPONSE_REJECT;
-#line 4170 "LibraryWindow.c"
+#line 4176 "LibraryWindow.c"
 		} else {
 			GtkResponseType _tmp17_ = 0;
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = copy_files_dialog ();
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = _tmp17_;
-#line 4177 "LibraryWindow.c"
+#line 4183 "LibraryWindow.c"
 		}
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		copy_files_response = _tmp9_;
-#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = copy_files_response;
-#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp18_ != GTK_RESPONSE_CANCEL) {
-#line 4185 "LibraryWindow.c"
+#line 4191 "LibraryWindow.c"
 			GtkFileChooserDialog* _tmp19_ = NULL;
 			GSList* _tmp20_ = NULL;
 			GSList* _tmp21_ = NULL;
 			GtkResponseType _tmp22_ = 0;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = import_dialog;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/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 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = _tmp20_;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = copy_files_response;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT);
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			__g_slist_free__g_free0_0 (_tmp21_);
-#line 4202 "LibraryWindow.c"
+#line 4208 "LibraryWindow.c"
 		}
 	}
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = import_dialog;
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 528 "/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 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->import_dir = _tmp24_;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = import_dialog;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4219 "LibraryWindow.c"
+#line 4225 "LibraryWindow.c"
 }
 
 
 static void library_window_on_external_library_import (LibraryWindow* self) {
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
-#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance ();
-#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog);
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_dialog_run (import_dialog);
-#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4236 "LibraryWindow.c"
+#line 4242 "LibraryWindow.c"
 }
 
 
@@ -4242,27 +4248,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	Page* _tmp1_ = NULL;
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp2_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/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 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = new_page;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 543 "/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 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 544 "/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 4266 "LibraryWindow.c"
+#line 4272 "LibraryWindow.c"
 }
 
 
@@ -4280,61 +4286,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp2_;
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	can_fullscreen = _tmp3_;
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_can_empty_trash (self);
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/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 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 556 "/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 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_window_can_jump_to_event (self);
-#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 557 "/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 552 "/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), "CommonFullscreen", can_fullscreen);
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = selected_count;
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = count;
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/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 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4326 "LibraryWindow.c"
+#line 4332 "LibraryWindow.c"
 }
 
 
 static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_empty_trash (self);
-#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 564 "/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 4338 "LibraryWindow.c"
+#line 4344 "LibraryWindow.c"
 }
 
 
@@ -4343,33 +4349,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/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 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ > 0) {
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4357 "LibraryWindow.c"
+#line 4363 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = video_global;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/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 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 4367 "LibraryWindow.c"
+#line 4373 "LibraryWindow.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4373 "LibraryWindow.c"
+#line 4379 "LibraryWindow.c"
 }
 
 
@@ -4386,66 +4392,66 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	const gchar* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/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 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 573 "/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 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp3_);
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = video_global;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/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 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp6_);
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _ ("Empty Trash");
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _ ("Emptying Trash…");
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/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 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = app_window_get_command_manager ();
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	command_manager_reset (_tmp10_);
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4432 "LibraryWindow.c"
+#line 4438 "LibraryWindow.c"
 }
 
 
 static void library_window_on_new_search (LibraryWindow* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 4449 "LibraryWindow.c"
+#line 4455 "LibraryWindow.c"
 }
 
 
@@ -4458,115 +4464,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/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 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 4482 "LibraryWindow.c"
+#line 4488 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		DataSource* _tmp7_ = NULL;
 		DataSource* _tmp8_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view;
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		selected_source = _tmp7_;
-#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = selected_source;
-#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (selected_source);
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4505 "LibraryWindow.c"
+#line 4511 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp9_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4512 "LibraryWindow.c"
+#line 4518 "LibraryWindow.c"
 				ViewCollection* _tmp10_ = NULL;
 				DataSource* _tmp11_ = NULL;
 				MediaSource* _tmp12_ = NULL;
 				Event* _tmp13_ = NULL;
 				Event* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp13_ = media_source_get_event (_tmp12_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp14_ = _tmp13_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp15_ = _tmp14_ != NULL;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp14_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp12_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = _tmp15_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4543 "LibraryWindow.c"
+#line 4549 "LibraryWindow.c"
 			} else {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4553 "LibraryWindow.c"
+#line 4559 "LibraryWindow.c"
 			}
 		}
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4558 "LibraryWindow.c"
+#line 4564 "LibraryWindow.c"
 	} else {
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4566 "LibraryWindow.c"
+#line 4572 "LibraryWindow.c"
 	}
-#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4570 "LibraryWindow.c"
+#line 4576 "LibraryWindow.c"
 }
 
 
@@ -4587,98 +4593,98 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	Event* _tmp11_ = NULL;
 	Event* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/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 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ != 1) {
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4615 "LibraryWindow.c"
+#line 4621 "LibraryWindow.c"
 	}
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == NULL) {
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4627 "LibraryWindow.c"
+#line 4633 "LibraryWindow.c"
 	}
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = media;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == NULL) {
-#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
-#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4641 "LibraryWindow.c"
+#line 4647 "LibraryWindow.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = media_source_get_event (_tmp10_);
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_;
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_ != NULL;
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp12_);
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 4655 "LibraryWindow.c"
+#line 4661 "LibraryWindow.c"
 		MediaSource* _tmp14_ = NULL;
 		Event* _tmp15_ = NULL;
 		Event* _tmp16_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media;
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = media_source_get_event (_tmp14_);
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_event (self, _tmp16_);
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 4669 "LibraryWindow.c"
+#line 4675 "LibraryWindow.c"
 	}
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4675 "LibraryWindow.c"
+#line 4681 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new5 (gboolean value) {
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4682 "LibraryWindow.c"
+#line 4688 "LibraryWindow.c"
 }
 
 
@@ -4688,57 +4694,57 @@ static void library_window_on_find (LibraryWindow* self) {
 	GAction* _tmp1_ = NULL;
 	GVariant* _tmp2_ = NULL;
 	SearchFilterToolbar* _tmp3_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/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"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new5 (TRUE);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_toolbar;
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_take_focus (_tmp3_);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4712 "LibraryWindow.c"
+#line 4718 "LibraryWindow.c"
 }
 
 
 static void library_window_on_media_altered (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_jump_to_event (self);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/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 4724 "LibraryWindow.c"
+#line 4730 "LibraryWindow.c"
 }
 
 
 static void library_window_on_clear_search (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4736 "LibraryWindow.c"
+#line 4742 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4742 "LibraryWindow.c"
+#line 4748 "LibraryWindow.c"
 	}
 }
 
@@ -4750,19 +4756,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	GSimpleAction* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	GSimpleAction* _tmp3_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 632 "/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"
+#line 632 "/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"
+#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = action;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4766 "LibraryWindow.c"
+#line 4772 "LibraryWindow.c"
 		gint _tmp4_ = 0;
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
@@ -4770,45 +4776,45 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		GVariant* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = action;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/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"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/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"
+#line 634 "/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"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp8_);
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp10_) {
-#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4792 "LibraryWindow.c"
+#line 4798 "LibraryWindow.c"
 		} else {
-#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4796 "LibraryWindow.c"
+#line 4802 "LibraryWindow.c"
 		}
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4800 "LibraryWindow.c"
+#line 4806 "LibraryWindow.c"
 	} else {
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4804 "LibraryWindow.c"
+#line 4810 "LibraryWindow.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4812 "LibraryWindow.c"
+#line 4818 "LibraryWindow.c"
 }
 
 
@@ -4819,38 +4825,38 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 	const gchar* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/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"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = value;
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/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"
+#line 641 "/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"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = value;
-#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4845 "LibraryWindow.c"
+#line 4851 "LibraryWindow.c"
 }
 
 
 static void library_window_on_preferences (LibraryWindow* self) {
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show ();
-#line 4854 "LibraryWindow.c"
+#line 4860 "LibraryWindow.c"
 }
 
 
@@ -4864,89 +4870,89 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	gboolean _tmp12_ = FALSE;
 	GSimpleAction* _tmp13_ = NULL;
 	GVariant* _tmp14_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/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"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4882 "LibraryWindow.c"
+#line 4888 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		GtkFrame* _tmp6_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 655 "/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 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->bottom_frame;
-#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4901 "LibraryWindow.c"
+#line 4907 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->sidebar_paned;
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 4911 "LibraryWindow.c"
+#line 4917 "LibraryWindow.c"
 			GtkFrame* _tmp9_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
-#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4917 "LibraryWindow.c"
+#line 4923 "LibraryWindow.c"
 		}
 	}
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = display;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/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 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = action;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = value;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4936 "LibraryWindow.c"
+#line 4942 "LibraryWindow.c"
 }
 
 
 static gboolean _variant_get6 (GVariant* value) {
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4943 "LibraryWindow.c"
+#line 4949 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new7 (gboolean value) {
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4950 "LibraryWindow.c"
+#line 4956 "LibraryWindow.c"
 }
 
 
@@ -4959,50 +4965,50 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 	GVariant* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
 	GAction* _tmp6_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 668 "/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"
+#line 668 "/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"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_get6 (_tmp2_);
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _variant_new7 (!_tmp3_);
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	new_state = _tmp5_;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = action;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 670 "/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"
+#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 4989 "LibraryWindow.c"
+#line 4995 "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"
+#line 673 "/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"
+#line 673 "/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"
+#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = value;
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 5006 "LibraryWindow.c"
+#line 5012 "LibraryWindow.c"
 }
 
 
@@ -5013,62 +5019,62 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	gboolean _tmp2_ = FALSE;
 	GSimpleAction* _tmp8_ = NULL;
 	GVariant* _tmp9_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/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"
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 5031 "LibraryWindow.c"
+#line 5037 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		ExtendedPropertiesWindow* _tmp6_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->extended_properties;
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/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 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp3_, _tmp5_);
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->extended_properties;
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5050 "LibraryWindow.c"
+#line 5056 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp7_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5057 "LibraryWindow.c"
+#line 5063 "LibraryWindow.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = value;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5065 "LibraryWindow.c"
+#line 5071 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new8 (gboolean value) {
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5072 "LibraryWindow.c"
+#line 5078 "LibraryWindow.c"
 }
 
 
@@ -5080,35 +5086,35 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 690 "/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"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_shown = _tmp1_;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/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 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _variant_new8 (is_shown);
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp5_);
-#line 5112 "LibraryWindow.c"
+#line 5118 "LibraryWindow.c"
 }
 
 
@@ -5122,55 +5128,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	CheckerboardPage* _tmp6_ = NULL;
 	CheckerboardPage* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/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 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5140 "LibraryWindow.c"
+#line 5146 "LibraryWindow.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
-#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_should_show_search_bar (self);
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/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 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 5156 "LibraryWindow.c"
+#line 5162 "LibraryWindow.c"
 	}
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = display;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 5168 "LibraryWindow.c"
+#line 5174 "LibraryWindow.c"
 		SearchFilterActions* _tmp9_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 5174 "LibraryWindow.c"
+#line 5180 "LibraryWindow.c"
 	}
 }
 
@@ -5180,23 +5186,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_ = FALSE;
 	GSimpleAction* _tmp2_ = NULL;
 	GVariant* _tmp3_ = NULL;
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp1_);
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5200 "LibraryWindow.c"
+#line 5206 "LibraryWindow.c"
 }
 
 
@@ -5206,25 +5212,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = visible;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/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 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = visible;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/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 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 5228 "LibraryWindow.c"
+#line 5234 "LibraryWindow.c"
 }
 
 
@@ -5234,23 +5240,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/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 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5254 "LibraryWindow.c"
+#line 5260 "LibraryWindow.c"
 }
 
 
@@ -5259,23 +5265,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_ = FALSE;
 	GSimpleAction* _tmp2_ = NULL;
 	GVariant* _tmp3_ = NULL;
-#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, _tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5279 "LibraryWindow.c"
+#line 5285 "LibraryWindow.c"
 }
 
 
@@ -5292,62 +5298,62 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp10_ = NULL;
 	ConfigFacade* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/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 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ == NULL;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5310 "LibraryWindow.c"
+#line 5316 "LibraryWindow.c"
 	}
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_toolbar (_tmp4_);
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp6_;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = toolbar;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
-#line 5328 "LibraryWindow.c"
+#line 5334 "LibraryWindow.c"
 		GtkRevealer* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = visible;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5337 "LibraryWindow.c"
+#line 5343 "LibraryWindow.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = visible;
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5351 "LibraryWindow.c"
+#line 5357 "LibraryWindow.c"
 }
 
 
@@ -5357,48 +5363,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/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 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/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 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5377 "LibraryWindow.c"
+#line 5383 "LibraryWindow.c"
 }
 
 
 static void library_window_show_extended_properties (LibraryWindow* self) {
-#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5386 "LibraryWindow.c"
+#line 5392 "LibraryWindow.c"
 }
 
 
 static void library_window_hide_extended_properties (LibraryWindow* self) {
-#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5395 "LibraryWindow.c"
+#line 5401 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new9 (gboolean value) {
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5402 "LibraryWindow.c"
+#line 5408 "LibraryWindow.c"
 }
 
 
@@ -5411,35 +5417,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 754 "/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 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_new9 (_tmp2_);
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp3_);
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = show;
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 758 "/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 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5443 "LibraryWindow.c"
+#line 5449 "LibraryWindow.c"
 }
 
 
@@ -5449,44 +5455,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	BatchImport* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = batch_import;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = allow_user_cancel;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5469 "LibraryWindow.c"
+#line 5475 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
 	ImportManifest* _tmp0_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = manifest;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5483 "LibraryWindow.c"
+#line 5489 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5490 "LibraryWindow.c"
+#line 5496 "LibraryWindow.c"
 }
 
 
@@ -5504,43 +5510,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	GeeArrayList* _tmp33_ = NULL;
 	gint _tmp34_ = 0;
 	gint _tmp35_ = 0;
-#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (job_name != NULL);
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5530 "LibraryWindow.c"
+#line 5536 "LibraryWindow.c"
 		gboolean _tmp7_ = FALSE;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5536 "LibraryWindow.c"
+#line 5542 "LibraryWindow.c"
 	} else {
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5540 "LibraryWindow.c"
+#line 5546 "LibraryWindow.c"
 	}
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5544 "LibraryWindow.c"
+#line 5550 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5552,65 +5558,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		GtkResponseType _tmp15_ = 0;
 		GtkResponseType _tmp16_ = 0;
 		GtkResponseType _tmp17_ = 0;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/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 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_strdup_printf (_tmp8_, "▸");
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _ ("_Import");
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _ ("Library Location");
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/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 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp14_);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp10_);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		response = _tmp16_;
 #line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		response = _tmp16_;
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = response;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp17_ == GTK_RESPONSE_CANCEL) {
-#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5586 "LibraryWindow.c"
+#line 5592 "LibraryWindow.c"
 		}
-#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5590 "LibraryWindow.c"
+#line 5596 "LibraryWindow.c"
 	}
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 783 "/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 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp18_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = uris;
-#line 5598 "LibraryWindow.c"
+#line 5604 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp19_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5606 "LibraryWindow.c"
+#line 5612 "LibraryWindow.c"
 			gchar* _tmp20_ = NULL;
 			gchar* uri = NULL;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = g_strdup ((const gchar*) uri_it->data);
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp20_;
-#line 5613 "LibraryWindow.c"
+#line 5619 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
 				const gchar* _tmp21_ = NULL;
@@ -5624,95 +5630,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 				gboolean _tmp30_ = FALSE;
 				FileImportJob* _tmp31_ = NULL;
 				FileImportJob* _tmp32_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = uri;
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				file_or_dir = _tmp22_;
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = file_or_dir;
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = g_file_get_path (_tmp23_);
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = _tmp24_;
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp26_ = _tmp25_ == NULL;
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp25_);
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp26_) {
-#line 5645 "LibraryWindow.c"
+#line 5651 "LibraryWindow.c"
 					const gchar* _tmp27_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp27_ = _ ("Photos cannot be imported from this directory.");
-#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_tmp27_, NULL);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5657 "LibraryWindow.c"
+#line 5663 "LibraryWindow.c"
 				}
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp28_ = jobs;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp29_ = file_or_dir;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp30_ = copy_to_library;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp31_ = file_import_job_new (_tmp29_, _tmp30_);
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp32_ = _tmp31_;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/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 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_batch_import_job_unref0 (_tmp32_);
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5677 "LibraryWindow.c"
+#line 5683 "LibraryWindow.c"
 			}
 		}
 	}
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = jobs;
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/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 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ > 0) {
-#line 5689 "LibraryWindow.c"
+#line 5695 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
 		GeeArrayList* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
 		BatchImport* _tmp38_ = NULL;
 		BatchImport* _tmp39_ = NULL;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = jobs;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp37_ = job_name;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/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 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		batch_import = _tmp38_;
-#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = batch_import;
-#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_enqueue_batch_import (self, _tmp39_, TRUE);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5711 "LibraryWindow.c"
+#line 5717 "LibraryWindow.c"
 	}
-#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5715 "LibraryWindow.c"
+#line 5721 "LibraryWindow.c"
 }
 
 
@@ -5733,157 +5739,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/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 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mask = _tmp4_;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
-#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5766 "LibraryWindow.c"
+#line 5772 "LibraryWindow.c"
 		gboolean _tmp11_ = FALSE;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5772 "LibraryWindow.c"
+#line 5778 "LibraryWindow.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5776 "LibraryWindow.c"
+#line 5782 "LibraryWindow.c"
 	}
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5780 "LibraryWindow.c"
+#line 5786 "LibraryWindow.c"
 		gboolean _tmp12_ = FALSE;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5786 "LibraryWindow.c"
+#line 5792 "LibraryWindow.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5790 "LibraryWindow.c"
+#line 5796 "LibraryWindow.c"
 	}
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5798 "LibraryWindow.c"
+#line 5804 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5807 "LibraryWindow.c"
+#line 5813 "LibraryWindow.c"
 			gboolean _tmp16_ = FALSE;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5813 "LibraryWindow.c"
+#line 5819 "LibraryWindow.c"
 		} else {
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5817 "LibraryWindow.c"
+#line 5823 "LibraryWindow.c"
 		}
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5821 "LibraryWindow.c"
+#line 5827 "LibraryWindow.c"
 			gboolean _tmp17_ = FALSE;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5827 "LibraryWindow.c"
+#line 5833 "LibraryWindow.c"
 		} else {
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5831 "LibraryWindow.c"
+#line 5837 "LibraryWindow.c"
 		}
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5839 "LibraryWindow.c"
+#line 5845 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5848 "LibraryWindow.c"
+#line 5854 "LibraryWindow.c"
 				gboolean _tmp21_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5854 "LibraryWindow.c"
+#line 5860 "LibraryWindow.c"
 			} else {
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5858 "LibraryWindow.c"
+#line 5864 "LibraryWindow.c"
 			}
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5862 "LibraryWindow.c"
+#line 5868 "LibraryWindow.c"
 				gboolean _tmp22_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5868 "LibraryWindow.c"
+#line 5874 "LibraryWindow.c"
 			} else {
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5872 "LibraryWindow.c"
+#line 5878 "LibraryWindow.c"
 			}
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5880 "LibraryWindow.c"
+#line 5886 "LibraryWindow.c"
 			} else {
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5886 "LibraryWindow.c"
+#line 5892 "LibraryWindow.c"
 			}
 		}
 	}
@@ -5907,87 +5913,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	GdkDragContext* _tmp13_ = NULL;
 	GdkDragAction _tmp14_ = 0;
 	guint _tmp15_ = 0U;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = context;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/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 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/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 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	target = _tmp2_;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = target;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = GDK_NONE;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 5928 "LibraryWindow.c"
+#line 5934 "LibraryWindow.c"
 		GdkDragContext* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:820: drag target is GDK_NONE");
-#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:826: drag target is GDK_NONE");
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = context;
-#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = time;
-#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5943 "LibraryWindow.c"
+#line 5949 "LibraryWindow.c"
 	}
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 5951 "LibraryWindow.c"
+#line 5957 "LibraryWindow.c"
 		GdkDragContext* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = context;
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = time;
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
-#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5964 "LibraryWindow.c"
+#line 5970 "LibraryWindow.c"
 	}
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = library_window_get_drag_action (self);
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	drag_action = _tmp11_;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = drag_action;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == GDK_ACTION_DEFAULT) {
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 5976 "LibraryWindow.c"
+#line 5982 "LibraryWindow.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = context;
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = drag_action;
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = time;
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5990 "LibraryWindow.c"
+#line 5996 "LibraryWindow.c"
 }
 
 
@@ -5997,54 +6003,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	guchar* _tmp1_ = NULL;
 	GdkDragContext* _tmp2_ = NULL;
 	GtkWidget* _tmp3_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selection_data;
-#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
-#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:847: failed to retrieve SelectionData");
-#line 6014 "LibraryWindow.c"
+#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData");
+#line 6020 "LibraryWindow.c"
 	}
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 6022 "LibraryWindow.c"
+#line 6028 "LibraryWindow.c"
 		GdkDragContext* _tmp4_ = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		guint _tmp7_ = 0U;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = selection_data;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = info;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = time;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6037 "LibraryWindow.c"
+#line 6043 "LibraryWindow.c"
 	} else {
 		GdkDragContext* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6047 "LibraryWindow.c"
+#line 6053 "LibraryWindow.c"
 	}
 }
 
@@ -6067,198 +6073,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	GdkDragAction _tmp22_ = 0;
 	GdkDragContext* _tmp23_ = NULL;
 	guint _tmp24_ = 0U;
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp2_;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp1_);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = uris_array;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 6094 "LibraryWindow.c"
+#line 6100 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp3_;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp3__length1;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6106 "LibraryWindow.c"
+#line 6112 "LibraryWindow.c"
 			gchar* _tmp4_ = NULL;
 			gchar* uri = NULL;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 6113 "LibraryWindow.c"
+#line 6119 "LibraryWindow.c"
 			{
 				const gchar* _tmp5_ = NULL;
 				gchar* _tmp6_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp6_ = g_strdup (_tmp5_);
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp6_);
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6125 "LibraryWindow.c"
+#line 6131 "LibraryWindow.c"
 			}
 		}
 	}
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	selected_action = _tmp8_;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = selected_action;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6139 "LibraryWindow.c"
+#line 6145 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp10_ = NULL;
 		GtkResponseType _tmp18_ = 0;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 6147 "LibraryWindow.c"
+#line 6153 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp10_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6155 "LibraryWindow.c"
+#line 6161 "LibraryWindow.c"
 				gchar* _tmp11_ = NULL;
 				gchar* uri = NULL;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 6162 "LibraryWindow.c"
+#line 6168 "LibraryWindow.c"
 				{
 					const gchar* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					GFile* _tmp14_ = NULL;
 					gboolean _tmp15_ = FALSE;
 					gboolean _tmp16_ = FALSE;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp14_ = _tmp13_;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp16_ = !_tmp15_;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp14_);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 6183 "LibraryWindow.c"
+#line 6189 "LibraryWindow.c"
 						GtkResponseType _tmp17_ = 0;
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = _tmp17_;
-#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6193 "LibraryWindow.c"
+#line 6199 "LibraryWindow.c"
 					}
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6197 "LibraryWindow.c"
+#line 6203 "LibraryWindow.c"
 				}
 			}
 		}
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _result_;
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp18_) {
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6207 "LibraryWindow.c"
+#line 6213 "LibraryWindow.c"
 			{
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
-#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6213 "LibraryWindow.c"
+#line 6219 "LibraryWindow.c"
 			}
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6217 "LibraryWindow.c"
+#line 6223 "LibraryWindow.c"
 			{
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
-#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6223 "LibraryWindow.c"
+#line 6229 "LibraryWindow.c"
 			}
 			default:
 			{
 				GdkDragContext* _tmp19_ = NULL;
 				guint _tmp20_ = 0U;
-#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
-#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = time;
-#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6241 "LibraryWindow.c"
+#line 6247 "LibraryWindow.c"
 			}
 		}
 	}
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = uris;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selected_action;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = context;
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = time;
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6261 "LibraryWindow.c"
+#line 6267 "LibraryWindow.c"
 }
 
 
@@ -6268,23 +6274,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	LibraryPhotosEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/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 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6287 "LibraryWindow.c"
+#line 6293 "LibraryWindow.c"
 }
 
 
@@ -6294,41 +6300,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	Event* _tmp1_ = NULL;
 	EventsEventEntry* _tmp2_ = NULL;
 	EventsEventEntry* _tmp3_ = NULL;
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6313 "LibraryWindow.c"
+#line 6319 "LibraryWindow.c"
 		EventsEventEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/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 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6327 "LibraryWindow.c"
+#line 6333 "LibraryWindow.c"
 	}
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6331 "LibraryWindow.c"
+#line 6337 "LibraryWindow.c"
 }
 
 
@@ -6338,41 +6344,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_ = NULL;
 	TagsSidebarEntry* _tmp2_ = NULL;
 	TagsSidebarEntry* _tmp3_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6357 "LibraryWindow.c"
+#line 6363 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/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 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6371 "LibraryWindow.c"
+#line 6377 "LibraryWindow.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6375 "LibraryWindow.c"
+#line 6381 "LibraryWindow.c"
 }
 
 
@@ -6382,41 +6388,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	SavedSearch* _tmp1_ = NULL;
 	SearchesSidebarEntry* _tmp2_ = NULL;
 	SearchesSidebarEntry* _tmp3_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6401 "LibraryWindow.c"
+#line 6407 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/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 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6415 "LibraryWindow.c"
+#line 6421 "LibraryWindow.c"
 	}
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6419 "LibraryWindow.c"
+#line 6425 "LibraryWindow.c"
 }
 
 
@@ -6432,66 +6438,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	CollectionPage* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	LibraryPhotoPage* _tmp12_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = controller;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = current;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/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 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->photo_page;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 6463 "LibraryWindow.c"
+#line 6469 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp7_ = NULL;
 		LibraryPhotoPage* _tmp8_ = NULL;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp7_);
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->photo_page = _tmp7_;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->photo_page;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6480 "LibraryWindow.c"
+#line 6486 "LibraryWindow.c"
 	}
-#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
-#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = controller;
-#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = current;
-#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
-#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->photo_page;
-#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6494 "LibraryWindow.c"
+#line 6500 "LibraryWindow.c"
 }
 
 
@@ -6501,23 +6507,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/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 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6520 "LibraryWindow.c"
+#line 6526 "LibraryWindow.c"
 }
 
 
@@ -6538,169 +6544,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	gboolean _tmp13_ = FALSE;
 	GMount* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera;
-#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6561 "LibraryWindow.c"
+#line 6567 "LibraryWindow.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/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 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = camera;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_->uri;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp8_;
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6579 "LibraryWindow.c"
+#line 6585 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GMount* _tmp11_ = NULL;
 		GMount* _tmp12_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp11_;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6593 "LibraryWindow.c"
-			goto __catch39_g_error;
+#line 6599 "LibraryWindow.c"
+			goto __catch41_g_error;
 		}
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp12_;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 6606 "LibraryWindow.c"
+#line 6612 "LibraryWindow.c"
 	}
-	goto __finally39;
-	__catch39_g_error:
+	goto __finally41;
+	__catch41_g_error:
 	{
 		GError* err = NULL;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6618 "LibraryWindow.c"
+#line 6624 "LibraryWindow.c"
 	}
-	__finally39:
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally41:
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/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 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6637 "LibraryWindow.c"
+#line 6643 "LibraryWindow.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 6643 "LibraryWindow.c"
+#line 6649 "LibraryWindow.c"
 		DiscoveredCamera* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_->uri;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 6655 "LibraryWindow.c"
+#line 6661 "LibraryWindow.c"
 	} else {
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 6659 "LibraryWindow.c"
+#line 6665 "LibraryWindow.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6663 "LibraryWindow.c"
+#line 6669 "LibraryWindow.c"
 		ImportPage* _tmp18_ = NULL;
 		GMount* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = mount;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 6675 "LibraryWindow.c"
+#line 6681 "LibraryWindow.c"
 			ImportPage* _tmp21_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6681 "LibraryWindow.c"
+#line 6687 "LibraryWindow.c"
 		} else {
-#line 961 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6685 "LibraryWindow.c"
+#line 6691 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp22_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6693 "LibraryWindow.c"
+#line 6699 "LibraryWindow.c"
 	}
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6703 "LibraryWindow.c"
+#line 6709 "LibraryWindow.c"
 }
 
 
@@ -6709,25 +6715,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	GtkStack* _tmp3_ = NULL;
-#line 968 "/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 968 "/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 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page;
-#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/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 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->stack;
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6730 "LibraryWindow.c"
+#line 6736 "LibraryWindow.c"
 }
 
 
@@ -6735,49 +6741,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	GtkStack* _tmp2_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/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 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->stack;
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6752 "LibraryWindow.c"
+#line 6758 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new10 (gboolean value) {
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6759 "LibraryWindow.c"
+#line 6765 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new11 (gboolean value) {
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6766 "LibraryWindow.c"
+#line 6772 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new12 (gboolean value) {
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6773 "LibraryWindow.c"
+#line 6779 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new13 (const gchar* value) {
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6780 "LibraryWindow.c"
+#line 6786 "LibraryWindow.c"
 }
 
 
@@ -6822,148 +6828,148 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	gchar* _tmp32_ = NULL;
 	GAction* _tmp33_ = NULL;
 	GVariant* _tmp34_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/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 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_display_action = _tmp1_;
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/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 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _variant_new10 (_tmp6_);
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/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 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	extended_display_action = _tmp9_;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = extended_display_action;
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_;
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/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 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = _variant_new11 (_tmp14_);
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp13_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/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 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_bar_display_action = _tmp17_;
-#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = search_bar_display_action;
-#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = search_bar_display_action;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = config_facade_get_instance ();
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = _tmp20_;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/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 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = _variant_new12 (_tmp22_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp19_, _tmp23_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp23_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp21_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/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 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sort_events_action = _tmp25_;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sort_events_action;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = config_facade_get_instance ();
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/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 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = _tmp30_;
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp31_) {
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6929 "LibraryWindow.c"
+#line 6935 "LibraryWindow.c"
 	} else {
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6933 "LibraryWindow.c"
+#line 6939 "LibraryWindow.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = g_strdup (_tmp27_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	event_sort_val = _tmp32_;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sort_events_action;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _variant_new13 (event_sort_val);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp33_, _tmp34_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp34_);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6957 "LibraryWindow.c"
+#line 6963 "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 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6966 "LibraryWindow.c"
+#line 6972 "LibraryWindow.c"
 }
 
 
@@ -6976,62 +6982,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	const gchar* _tmp5_ = NULL;
 	GtkProgressBar* _tmp6_ = NULL;
 	guint _tmp7_ = 0U;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6991 "LibraryWindow.c"
+#line 6997 "LibraryWindow.c"
 	}
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = priority;
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp3_;
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = label;
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->background_progress_bar;
-#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp6_);
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1028 "/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 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 7017 "LibraryWindow.c"
+#line 7023 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7034 "LibraryWindow.c"
+#line 7040 "LibraryWindow.c"
 }
 
 
@@ -7040,43 +7046,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	gint _tmp1_ = 0;
 	guint _tmp2_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7053 "LibraryWindow.c"
+#line 7059 "LibraryWindow.c"
 	}
-#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 7059 "LibraryWindow.c"
+#line 7065 "LibraryWindow.c"
 		guint _tmp3_ = 0U;
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
-#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 7067 "LibraryWindow.c"
+#line 7073 "LibraryWindow.c"
 	}
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 7073 "LibraryWindow.c"
+#line 7079 "LibraryWindow.c"
 		gint _tmp5_ = 0;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7079 "LibraryWindow.c"
+#line 7085 "LibraryWindow.c"
 	}
 }
 
@@ -7100,102 +7106,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp18_ = 0.0;
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
-#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7115 "LibraryWindow.c"
+#line 7121 "LibraryWindow.c"
 	}
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = count;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ <= 0.0) {
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 7127 "LibraryWindow.c"
+#line 7133 "LibraryWindow.c"
 	} else {
 		gdouble _tmp6_ = 0.0;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 7134 "LibraryWindow.c"
+#line 7140 "LibraryWindow.c"
 	}
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 7140 "LibraryWindow.c"
+#line 7146 "LibraryWindow.c"
 	} else {
 		gdouble _tmp7_ = 0.0;
 		gdouble _tmp8_ = 0.0;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7150 "LibraryWindow.c"
+#line 7156 "LibraryWindow.c"
 	}
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7154 "LibraryWindow.c"
+#line 7160 "LibraryWindow.c"
 		gint _tmp9_ = 0;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7162 "LibraryWindow.c"
+#line 7168 "LibraryWindow.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp10_;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = count;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = total;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fraction = _tmp11_ / _tmp12_;
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->background_progress_bar;
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = fraction;
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = _ ("%s (%d%%)");
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = label;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = fraction;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0));
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = _tmp19_;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp20_);
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp20_);
-#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7198 "LibraryWindow.c"
+#line 7204 "LibraryWindow.c"
 }
 
 
@@ -7205,149 +7211,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gint _tmp2_ = 0;
 	GtkProgressBar* _tmp3_ = NULL;
 	GtkProgressBar* _tmp4_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7218 "LibraryWindow.c"
+#line 7224 "LibraryWindow.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1084 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
-#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, "");
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7236 "LibraryWindow.c"
+#line 7242 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7248 "LibraryWindow.c"
+#line 7254 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
 		GtkFrame* _tmp3_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1098 "/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 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7264 "LibraryWindow.c"
+#line 7270 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7277 "LibraryWindow.c"
+#line 7283 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/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 1101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7288 "LibraryWindow.c"
+#line 7294 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Updating library…");
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7301 "LibraryWindow.c"
+#line 7307 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
-#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7310 "LibraryWindow.c"
+#line 7316 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
 	gint _tmp0_ = 0;
-#line 1113 "/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 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total_files;
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7324 "LibraryWindow.c"
+#line 7330 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Updating library…");
-#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed_files;
-#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total_files;
-#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/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 7337 "LibraryWindow.c"
+#line 7343 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/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"
+#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Preparing to auto-import photos…");
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7350 "LibraryWindow.c"
+#line 7356 "LibraryWindow.c"
 }
 
 
@@ -7355,44 +7361,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo
 	const gchar* _tmp0_ = NULL;
 	guint64 _tmp1_ = 0ULL;
 	guint64 _tmp2_ = 0ULL;
-#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Auto-importing photos…");
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = completed_bytes;
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = total_bytes;
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1134 "/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 7368 "LibraryWindow.c"
+#line 7374 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
 	guint _tmp0_ = 0U;
-#line 1132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7382 "LibraryWindow.c"
+#line 7388 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Writing metadata to files…");
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed;
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total;
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1142 "/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 7395 "LibraryWindow.c"
+#line 7401 "LibraryWindow.c"
 	}
 }
 
@@ -7447,235 +7453,222 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	GtkBox* _tmp45_ = NULL;
 	GtkPaned* _tmp46_ = NULL;
 	GtkBox* _tmp47_ = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp48_ = NULL;
-	GObject* _tmp49_ = NULL;
-	Page* _tmp50_ = NULL;
-	Page* _tmp51_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	Page* _tmp48_ = NULL;
+	Page* _tmp49_ = NULL;
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (start_page));
-#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	scrolled_sidebar = _tmp0_;
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1152 "/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 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/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 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/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 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1156 "/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 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp6_, "frame");
-#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->basic_properties;
-#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/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 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1160 "/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 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->basic_properties;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/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 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->basic_properties;
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/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 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->basic_properties;
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/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 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->basic_properties;
-#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1164 "/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 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->basic_properties;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1165 "/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 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->basic_properties;
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/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 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->bottom_frame;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->basic_properties;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/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 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->bottom_frame;
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/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 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp18_, "frame");
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->top_section;
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/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 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = self->priv->sidebar_paned;
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->top_section;
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/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 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = self->priv->sidebar_paned;
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->bottom_frame;
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/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 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = self->priv->sidebar_paned;
-#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp24_, 1000);
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->right_vbox = _tmp25_;
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = self->priv->right_vbox;
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = self->priv->search_toolbar;
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/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 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = self->priv->right_vbox;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = self->priv->stack;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1181 "/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 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->right_vbox;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = self->priv->toolbar_revealer;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	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 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp32_);
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->client_paned);
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->client_paned = _tmp32_;
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = self->priv->client_paned;
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = self->priv->sidebar_paned;
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = self->priv->sidebar_tree;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = self->priv->client_paned;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = self->priv->right_vbox;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = self->priv->client_paned;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp38_, _tmp41_);
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp40_);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = self->priv->stack;
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = self->priv->layout;
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = self->priv->client_paned;
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = self->priv->layout;
-#line 1188 "/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 (_tmp47_, gtk_widget_get_type (), GtkWidget));
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui");
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	builder = _tmp48_;
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp49_ = gtk_builder_get_object (builder, "appmenu");
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_get_type ()) ? ((GMenu*) _tmp49_) : NULL, g_menu_model_get_type (), GMenuModel));
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_ = start_page;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp50_);
 #line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp51_ = start_page;
+	_tmp47_ = self->priv->layout;
 #line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (builder);
-#line 1141 "/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 (_tmp47_, gtk_widget_get_type (), GtkWidget));
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp48_ = start_page;
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_switch_to_page (self, _tmp48_);
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp49_ = start_page;
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7651 "LibraryWindow.c"
+#line 7644 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
 	Page* _tmp0_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 7666 "LibraryWindow.c"
+#line 7659 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
 	gboolean _tmp0_ = FALSE;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 7678 "LibraryWindow.c"
+#line 7671 "LibraryWindow.c"
 }
 
 
@@ -7707,48 +7700,56 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	Page* _tmp43_ = NULL;
 	GMenuModel* _tmp44_ = NULL;
 	GMenuModel* _tmp45_ = NULL;
+	gboolean old = FALSE;
+	GtkSettings* _tmp46_ = NULL;
+	gboolean _tmp47_ = FALSE;
+	gboolean _tmp48_ = FALSE;
+	GtkSettings* _tmp49_ = NULL;
+	gboolean _tmp50_ = FALSE;
+	GtkSettings* _tmp51_ = NULL;
+	gboolean _tmp52_ = FALSE;
 	GtkToolbar* toolbar = NULL;
-	Page* _tmp46_ = NULL;
-	GtkToolbar* _tmp47_ = NULL;
-	GtkToolbar* _tmp48_ = NULL;
-	Page* _tmp54_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	Page* _tmp53_ = NULL;
+	GtkToolbar* _tmp54_ = NULL;
+	GtkToolbar* _tmp55_ = NULL;
+	Page* _tmp61_ = NULL;
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7725 "LibraryWindow.c"
+#line 7726 "LibraryWindow.c"
 	}
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/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 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp1_ == _tmp3_;
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7741 "LibraryWindow.c"
+#line 7742 "LibraryWindow.c"
 	}
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/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 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp5_;
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = current_page;
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 7751 "LibraryWindow.c"
+#line 7752 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
 		Page* _tmp7_ = NULL;
 		GtkToolbar* _tmp8_ = NULL;
@@ -7756,96 +7757,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		Page* _tmp12_ = NULL;
 		Page* _tmp13_ = NULL;
 		Page* _tmp15_ = NULL;
-#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/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 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
-#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = current_page;
-#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_toolbar (_tmp7_);
-#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		toolbar = _tmp8_;
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = toolbar;
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 7773 "LibraryWindow.c"
+#line 7774 "LibraryWindow.c"
 			GtkRevealer* _tmp10_ = NULL;
 			GtkToolbar* _tmp11_ = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = self->priv->toolbar_revealer;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/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 7782 "LibraryWindow.c"
+#line 7783 "LibraryWindow.c"
 		}
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp12_);
-#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7792 "LibraryWindow.c"
+#line 7793 "LibraryWindow.c"
 			SidebarTree* _tmp14_ = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
-#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 7798 "LibraryWindow.c"
+#line 7799 "LibraryWindow.c"
 		}
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7806 "LibraryWindow.c"
+#line 7807 "LibraryWindow.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = page;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/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 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = page;
-#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/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 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = page;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7822 "LibraryWindow.c"
+#line 7823 "LibraryWindow.c"
 		SidebarTree* _tmp20_ = NULL;
-#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
-#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 7828 "LibraryWindow.c"
+#line 7829 "LibraryWindow.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = page;
-#line 1247 "/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 1250 "/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 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->page_map;
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = page;
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/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 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = (SidebarEntry*) _tmp25_;
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = entry;
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 7848 "LibraryWindow.c"
+#line 7849 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
 		SidebarEntry* _tmp27_ = NULL;
 		SidebarExpandableEntry* _tmp28_ = NULL;
@@ -7853,141 +7854,161 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		SidebarExpandableEntry* _tmp30_ = NULL;
 		SidebarTree* _tmp35_ = NULL;
 		SidebarEntry* _tmp36_ = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/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 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		expandable_entry = _tmp28_;
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = expandable_entry;
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 7866 "LibraryWindow.c"
+#line 7867 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp31_ = NULL;
 			gboolean _tmp32_ = FALSE;
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 7875 "LibraryWindow.c"
+#line 7876 "LibraryWindow.c"
 		} else {
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 7879 "LibraryWindow.c"
+#line 7880 "LibraryWindow.c"
 		}
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 7883 "LibraryWindow.c"
+#line 7884 "LibraryWindow.c"
 			SidebarTree* _tmp33_ = NULL;
 			SidebarEntry* _tmp34_ = NULL;
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7892 "LibraryWindow.c"
+#line 7893 "LibraryWindow.c"
 		}
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = entry;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7902 "LibraryWindow.c"
+#line 7903 "LibraryWindow.c"
 	}
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = page;
-#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7910 "LibraryWindow.c"
+#line 7911 "LibraryWindow.c"
 		Page* _tmp38_ = NULL;
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1267 "/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 7916 "LibraryWindow.c"
+#line 7917 "LibraryWindow.c"
 	}
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
 #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 1272 "/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 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp41_);
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = page;
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (_tmp42_);
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = page;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = page_get_menubar (_tmp43_);
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = _tmp44_;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	application_set_menubar (_tmp45_);
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp45_);
-#line 1274 "/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 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_ = page;
+	_tmp45_ = _tmp44_;
 #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = page_get_toolbar (_tmp46_);
+	application_set_menubar (_tmp45_);
 #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp47_;
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = toolbar;
+	_g_object_unref0 (_tmp45_);
 #line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp48_ != NULL) {
-#line 7956 "LibraryWindow.c"
-		GtkRevealer* _tmp49_ = NULL;
-		GtkToolbar* _tmp50_ = NULL;
-		GtkToolbar* _tmp51_ = NULL;
-		GtkRevealer* _tmp52_ = NULL;
-		gboolean _tmp53_ = FALSE;
+	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
 #line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp49_ = self->priv->toolbar_revealer;
+	_tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp50_ = toolbar;
+	g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL);
 #line 1278 "/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));
+	_tmp48_ = _tmp47_;
+#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	old = _tmp48_;
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp51_ = toolbar;
+	_tmp50_ = old;
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+	g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL);
 #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp52_ = self->priv->toolbar_revealer;
+	_tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp53_ = library_window_is_toolbar_visible (self);
+	_tmp52_ = old;
 #line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_revealer_set_reveal_child (_tmp52_, _tmp53_);
-#line 7978 "LibraryWindow.c"
-	}
+	g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL);
+#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp53_ = page;
+#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp54_ = page_get_toolbar (_tmp53_);
+#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	toolbar = _tmp54_;
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_ = page;
+	_tmp55_ = toolbar;
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_ready (_tmp54_);
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp55_ != NULL) {
+#line 7977 "LibraryWindow.c"
+		GtkRevealer* _tmp56_ = NULL;
+		GtkToolbar* _tmp57_ = NULL;
+		GtkToolbar* _tmp58_ = NULL;
+		GtkRevealer* _tmp59_ = NULL;
+		gboolean _tmp60_ = FALSE;
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp56_ = self->priv->toolbar_revealer;
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp57_ = toolbar;
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp58_ = toolbar;
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp59_ = self->priv->toolbar_revealer;
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp60_ = library_window_is_toolbar_visible (self);
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
+#line 7999 "LibraryWindow.c"
+	}
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp61_ = page;
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	page_ready (_tmp61_);
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 7990 "LibraryWindow.c"
+#line 8011 "LibraryWindow.c"
 }
 
 
@@ -8002,41 +8023,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	CheckerboardPage* _tmp7_ = NULL;
 	SearchViewFilter* _tmp8_ = NULL;
 	SearchViewFilter* _tmp9_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp3_);
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = page;
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/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 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp9_);
-#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 8039 "LibraryWindow.c"
+#line 8060 "LibraryWindow.c"
 }
 
 
@@ -8046,35 +8067,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/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 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8061 "LibraryWindow.c"
+#line 8082 "LibraryWindow.c"
 		gboolean _tmp4_ = FALSE;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 8067 "LibraryWindow.c"
+#line 8088 "LibraryWindow.c"
 	} else {
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8071 "LibraryWindow.c"
+#line 8092 "LibraryWindow.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8077 "LibraryWindow.c"
+#line 8098 "LibraryWindow.c"
 }
 
 
@@ -8082,21 +8103,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	SearchFilterToolbar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = show;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/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 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8099 "LibraryWindow.c"
+#line 8120 "LibraryWindow.c"
 		CheckerboardPage* _tmp3_ = NULL;
 		SearchFilterToolbar* _tmp4_ = NULL;
 		CheckerboardPage* _tmp5_ = NULL;
@@ -8108,70 +8129,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		CheckerboardPage* _tmp11_ = NULL;
 		SearchViewFilter* _tmp12_ = NULL;
 		SearchViewFilter* _tmp13_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_assert (NULL != _tmp3_, "null != page");
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->search_toolbar;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = page;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = page;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/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 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp13_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 8145 "LibraryWindow.c"
+#line 8166 "LibraryWindow.c"
 	} else {
 		CheckerboardPage* _tmp14_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 8152 "LibraryWindow.c"
+#line 8173 "LibraryWindow.c"
 			CheckerboardPage* _tmp15_ = NULL;
 			ViewCollection* _tmp16_ = NULL;
 			ViewCollection* _tmp17_ = NULL;
 			DisabledViewFilter* _tmp18_ = NULL;
 			DisabledViewFilter* _tmp19_ = NULL;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = _tmp16_;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp18_ = disabled_view_filter_new ();
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = _tmp18_;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/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 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp19_);
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 8174 "LibraryWindow.c"
+#line 8195 "LibraryWindow.c"
 		}
 	}
 }
@@ -8185,33 +8206,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	Page* _tmp4_ = NULL;
 	SidebarPageRepresentative* _tmp5_ = NULL;
 	Page* _tmp6_ = NULL;
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/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 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->page_map;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = entry;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/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 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 8214 "LibraryWindow.c"
+#line 8235 "LibraryWindow.c"
 }
 
 
@@ -8225,61 +8246,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	GeeHashMap* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/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 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp0_ == _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8246 "LibraryWindow.c"
+#line 8267 "LibraryWindow.c"
 		LibraryBranch* _tmp4_ = NULL;
 		LibraryPhotosEntry* _tmp5_ = NULL;
 		LibraryPhotosEntry* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/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 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp8_);
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8266 "LibraryWindow.c"
+#line 8287 "LibraryWindow.c"
 	}
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, _tmp9_);
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->page_map;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/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 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	removed = _tmp12_;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8282 "LibraryWindow.c"
+#line 8303 "LibraryWindow.c"
 }
 
 
@@ -8288,39 +8309,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	SidebarSelectableEntry* _tmp0_ = NULL;
 	SidebarPageRepresentative* _tmp1_ = NULL;
 	SidebarPageRepresentative* _tmp2_ = NULL;
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selectable;
-#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/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 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_rep = _tmp1_;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_rep;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 8305 "LibraryWindow.c"
+#line 8326 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8319 "LibraryWindow.c"
+#line 8340 "LibraryWindow.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8323 "LibraryWindow.c"
+#line 8344 "LibraryWindow.c"
 }
 
 
@@ -8341,207 +8362,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	LibraryPhotosEntry* _tmp32_ = NULL;
 	Page* _tmp33_ = NULL;
 	Page* _tmp34_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = selectable;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8362 "LibraryWindow.c"
+#line 8383 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/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 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 8374 "LibraryWindow.c"
+#line 8395 "LibraryWindow.c"
 	} else {
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8378 "LibraryWindow.c"
+#line 8399 "LibraryWindow.c"
 	}
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8382 "LibraryWindow.c"
+#line 8403 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/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 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp11_);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8400 "LibraryWindow.c"
+#line 8421 "LibraryWindow.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8406 "LibraryWindow.c"
+#line 8427 "LibraryWindow.c"
 		EventsBranch* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/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 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 8415 "LibraryWindow.c"
+#line 8436 "LibraryWindow.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 8419 "LibraryWindow.c"
+#line 8440 "LibraryWindow.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 8423 "LibraryWindow.c"
+#line 8444 "LibraryWindow.c"
 		EventsBranch* _tmp16_ = NULL;
 		EventsMasterDirectoryEntry* _tmp17_ = NULL;
 		EventsMasterDirectoryEntry* _tmp18_ = NULL;
 		Page* _tmp19_ = NULL;
 		Page* _tmp20_ = NULL;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = events_branch_get_master_entry (_tmp16_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/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 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp20_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8449 "LibraryWindow.c"
+#line 8470 "LibraryWindow.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8455 "LibraryWindow.c"
+#line 8476 "LibraryWindow.c"
 		EventsBranch* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/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 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 8464 "LibraryWindow.c"
+#line 8485 "LibraryWindow.c"
 	} else {
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 8468 "LibraryWindow.c"
+#line 8489 "LibraryWindow.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 8472 "LibraryWindow.c"
+#line 8493 "LibraryWindow.c"
 		EventsBranch* _tmp25_ = NULL;
 		EventsMasterDirectoryEntry* _tmp26_ = NULL;
 		EventsMasterDirectoryEntry* _tmp27_ = NULL;
 		Page* _tmp28_ = NULL;
 		Page* _tmp29_ = NULL;
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = events_branch_get_master_entry (_tmp25_);
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = _tmp26_;
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/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 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp29_);
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp29_);
-#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp27_);
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8498 "LibraryWindow.c"
+#line 8519 "LibraryWindow.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/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 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp34_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8516 "LibraryWindow.c"
+#line 8537 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8523 "LibraryWindow.c"
+#line 8544 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8530 "LibraryWindow.c"
+#line 8551 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8537 "LibraryWindow.c"
+#line 8558 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8544 "LibraryWindow.c"
+#line 8565 "LibraryWindow.c"
 }
 
 
@@ -8549,27 +8570,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	ViewCollection* view = NULL;
 	Page* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1372 "/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 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/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 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/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 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/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 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8572 "LibraryWindow.c"
+#line 8593 "LibraryWindow.c"
 }
 
 
@@ -8581,47 +8602,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	guint _tmp3_ = 0U;
 	guint _tmp4_ = 0U;
 	guint _tmp5_ = 0U;
-#line 1372 "/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 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/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 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/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 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/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 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1384 "/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 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8612 "LibraryWindow.c"
+#line 8633 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
 	OneShotScheduler* _tmp0_ = NULL;
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8624 "LibraryWindow.c"
+#line 8645 "LibraryWindow.c"
 }
 
 
@@ -8632,55 +8653,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	ExtendedPropertiesWindow* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1392 "/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 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8645 "LibraryWindow.c"
+#line 8666 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/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 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8659 "LibraryWindow.c"
+#line 8680 "LibraryWindow.c"
 	}
-#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/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 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8669 "LibraryWindow.c"
+#line 8690 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/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 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8683 "LibraryWindow.c"
+#line 8704 "LibraryWindow.c"
 	}
 }
 
@@ -8688,13 +8709,13 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 8697 "LibraryWindow.c"
+#line 8718 "LibraryWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -8707,100 +8728,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8728 "LibraryWindow.c"
-				goto __catch41_g_regex_error;
+#line 8749 "LibraryWindow.c"
+				goto __catch43_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8737 "LibraryWindow.c"
+#line 8758 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8753 "LibraryWindow.c"
-				goto __catch41_g_regex_error;
+#line 8774 "LibraryWindow.c"
+				goto __catch43_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8764 "LibraryWindow.c"
+#line 8785 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8778 "LibraryWindow.c"
+#line 8799 "LibraryWindow.c"
 	}
-	goto __finally41;
-	__catch41_g_regex_error:
+	goto __finally43;
+	__catch43_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8792 "LibraryWindow.c"
+#line 8813 "LibraryWindow.c"
 	}
-	__finally41:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally43:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8803 "LibraryWindow.c"
+#line 8824 "LibraryWindow.c"
 	}
 }
 
@@ -8818,188 +8839,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
-#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = uri;
-#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1394: mount point reported: %s", _tmp0_);
-#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1400: mount point reported: %s", _tmp0_);
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = uri;
-#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
-#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 8835 "LibraryWindow.c"
+#line 8856 "LibraryWindow.c"
 		const gchar* _tmp3_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
-#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1398: Unsupported mount scheme: %s", _tmp3_);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1404: Unsupported mount scheme: %s", _tmp3_);
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8843 "LibraryWindow.c"
+#line 8864 "LibraryWindow.c"
 	}
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_file_new_for_uri (_tmp4_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp5_;
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8853 "LibraryWindow.c"
+#line 8874 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		GMount* _tmp8_ = NULL;
 		GMount* _tmp9_ = NULL;
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp8_;
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8867 "LibraryWindow.c"
-			goto __catch40_g_error;
+#line 8888 "LibraryWindow.c"
+			goto __catch42_g_error;
 		}
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = NULL;
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp9_;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 8880 "LibraryWindow.c"
+#line 8901 "LibraryWindow.c"
 	}
-	goto __finally40;
-	__catch40_g_error:
+	goto __finally42;
+	__catch42_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = err;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1410: %s", _tmp11_);
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1416: %s", _tmp11_);
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8906 "LibraryWindow.c"
+#line 8927 "LibraryWindow.c"
 	}
-	__finally40:
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally42:
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/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 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8921 "LibraryWindow.c"
+#line 8942 "LibraryWindow.c"
 	}
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
-#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = uri;
-#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8931 "LibraryWindow.c"
+#line 8952 "LibraryWindow.c"
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = camera_table_get_port_uri (_tmp16_);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp17_;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 8950 "LibraryWindow.c"
+#line 8971 "LibraryWindow.c"
 	}
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 8956 "LibraryWindow.c"
+#line 8977 "LibraryWindow.c"
 		const gchar* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
-#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
-#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 8967 "LibraryWindow.c"
+#line 8988 "LibraryWindow.c"
 			GeeHashSet* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/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 8976 "LibraryWindow.c"
+#line 8997 "LibraryWindow.c"
 		}
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = is_string_empty (_tmp23_);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 8984 "LibraryWindow.c"
+#line 9005 "LibraryWindow.c"
 			GeeHashSet* _tmp25_ = NULL;
 			const gchar* _tmp26_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/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 8993 "LibraryWindow.c"
+#line 9014 "LibraryWindow.c"
 		}
 	}
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 9002 "LibraryWindow.c"
+#line 9023 "LibraryWindow.c"
 }
 
 
@@ -9016,97 +9037,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	GdkEventKey* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	const gchar* _tmp15_ = NULL;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/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 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9031 "LibraryWindow.c"
+#line 9052 "LibraryWindow.c"
 		SidebarTree* _tmp5_ = NULL;
 		GdkEventKey* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = event;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 9043 "LibraryWindow.c"
+#line 9064 "LibraryWindow.c"
 	} else {
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 9047 "LibraryWindow.c"
+#line 9068 "LibraryWindow.c"
 	}
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 9051 "LibraryWindow.c"
+#line 9072 "LibraryWindow.c"
 		SidebarTree* _tmp8_ = NULL;
 		GdkEventKey* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = event;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/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 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 9063 "LibraryWindow.c"
+#line 9084 "LibraryWindow.c"
 	} else {
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9067 "LibraryWindow.c"
+#line 9088 "LibraryWindow.c"
 	}
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9075 "LibraryWindow.c"
+#line 9096 "LibraryWindow.c"
 	}
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1442 "/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 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9087 "LibraryWindow.c"
+#line 9108 "LibraryWindow.c"
 	}
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _tmp13_->keyval;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
-#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
-#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9103 "LibraryWindow.c"
+#line 9124 "LibraryWindow.c"
 	}
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9109 "LibraryWindow.c"
+#line 9130 "LibraryWindow.c"
 }
 
 
@@ -9122,14 +9143,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 9125 "LibraryWindow.c"
+#line 9146 "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 9132 "LibraryWindow.c"
+#line 9153 "LibraryWindow.c"
 }
 
 
@@ -9175,14 +9196,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 9178 "LibraryWindow.c"
+#line 9199 "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 9185 "LibraryWindow.c"
+#line 9206 "LibraryWindow.c"
 }
 
 
@@ -9203,22 +9224,30 @@ 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 9206 "LibraryWindow.c"
+#line 9227 "LibraryWindow.c"
+}
+
+
+static void library_window_fullscreen_photo_page_real_switching_from (Page* base) {
+	LibraryWindowFullscreenPhotoPage * self;
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
+#line 9235 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	LibraryWindowFullscreenPhotoPage * self;
 	GeeList* _tmp0_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (GEE_IS_LIST (ui_filenames));
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = ui_filenames;
-#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 93 "/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 9221 "LibraryWindow.c"
+#line 9250 "LibraryWindow.c"
 }
 
 
@@ -9230,17 +9259,19 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((PageClass *) klass)->switched_to = library_window_fullscreen_photo_page_real_switched_to;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	((PageClass *) klass)->switching_from = library_window_fullscreen_photo_page_real_switching_from;
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((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 9236 "LibraryWindow.c"
+#line 9267 "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 9243 "LibraryWindow.c"
+#line 9274 "LibraryWindow.c"
 }
 
 
@@ -9256,7 +9287,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 9259 "LibraryWindow.c"
+#line 9290 "LibraryWindow.c"
 }
 
 
@@ -9306,11 +9337,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 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 121 "/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 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9313 "LibraryWindow.c"
+#line 9344 "LibraryWindow.c"
 }
 
 
@@ -9337,121 +9368,121 @@ static void library_window_instance_init (LibraryWindow * self) {
 	GtkRevealer* _tmp19_ = 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"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_get_home_dir ();
-#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_dir = _tmp1_;
+#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp2_);
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_paned = _tmp2_;
-#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp3_);
-#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->client_paned = _tmp3_;
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#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"
+	self->priv->bottom_frame = _tmp4_;
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = NULL;
-#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 104 "/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"
+#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_branch_new ();
-#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->library_branch = _tmp5_;
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = tags_branch_new ();
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->tags_branch = _tmp6_;
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = folders_branch_new ();
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->folders_branch = _tmp7_;
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = events_branch_new ();
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->events_branch = _tmp8_;
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = camera_branch_new ();
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->camera_branch = _tmp9_;
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = searches_branch_new ();
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->saved_search_branch = _tmp10_;
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->page_switching_enabled = TRUE;
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->page_switching_enabled = TRUE;
+#line 116 "/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"
+	self->priv->page_map = _tmp11_;
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->photo_page = NULL;
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = FALSE;
-#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = search_filter_actions_new ();
-#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_actions = _tmp12_;
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 131 "/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"
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp13_);
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->top_section = _tmp13_;
-#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp14_);
-#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_frame = _tmp14_;
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp15_);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/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_displayed = FALSE;
 #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"
 	_tmp16_ = basic_properties_new ();
-#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp16_);
-#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#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"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = (GtkStack*) gtk_stack_new ();
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->stack = _tmp17_;
-#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/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"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp18_);
-#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->layout = _tmp18_;
 #line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->layout = _tmp18_;
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = (GtkRevealer*) gtk_revealer_new ();
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 142 "/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->toolbar_revealer = _tmp19_;
 #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->toolbar_revealer = _tmp19_;
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9454 "LibraryWindow.c"
+#line 9485 "LibraryWindow.c"
 }
 
 
@@ -9491,51 +9522,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 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/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 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/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 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/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 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/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 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/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 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/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 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/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 9538 "LibraryWindow.c"
+#line 9569 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_ = NULL;
@@ -9544,27 +9575,27 @@ static void library_window_finalize (GObject* obj) {
 		GeeCollection* _tmp17_ = NULL;
 		GeeIterator* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9567 "LibraryWindow.c"
+#line 9598 "LibraryWindow.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
@@ -9574,161 +9605,161 @@ static void library_window_finalize (GObject* obj) {
 			guint _tmp25_ = 0U;
 			MediaSourceCollection* _tmp26_ = NULL;
 			guint _tmp27_ = 0U;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp21_) {
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9585 "LibraryWindow.c"
+#line 9616 "LibraryWindow.c"
 			}
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			media_sources = (MediaSourceCollection*) _tmp23_;
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = media_sources;
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/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 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = media_sources;
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/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 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9607 "LibraryWindow.c"
+#line 9638 "LibraryWindow.c"
 		}
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9611 "LibraryWindow.c"
+#line 9642 "LibraryWindow.c"
 	}
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/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 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_monitor_pool_get_instance ();
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp32_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	monitor = _tmp34_;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = monitor;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 9639 "LibraryWindow.c"
+#line 9670 "LibraryWindow.c"
 		LibraryMonitor* _tmp36_ = NULL;
-#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
-#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9645 "LibraryWindow.c"
+#line 9676 "LibraryWindow.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = _tmp37_;
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/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 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp38_);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = library_monitor_pool_get_instance ();
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/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 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp41_);
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = camera_table_get_instance ();
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/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 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/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);
-#line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (self->priv->import_dir);
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_free0 (self->priv->import_dir);
+#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_paned);
-#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->client_paned);
-#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->bottom_frame);
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->library_branch);
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->tags_branch);
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->folders_branch);
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->events_branch);
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->camera_branch);
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->saved_search_branch);
-#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->page_map);
 #line 116 "/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"
 	_g_object_unref0 (self->priv->photo_page);
-#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_search_filter_actions_unref0 (self->priv->search_actions);
-#line 127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->search_toolbar);
 #line 129 "/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"
 	_g_object_unref0 (self->priv->top_section);
-#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_frame);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_bar);
-#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->basic_properties);
-#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->extended_properties);
 #line 137 "/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"
 	_g_object_unref0 (self->priv->stack);
-#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 9731 "LibraryWindow.c"
+#line 9762 "LibraryWindow.c"
 }
 
 
@@ -9749,13 +9780,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 9752 "LibraryWindow.c"
+#line 9783 "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 9758 "LibraryWindow.c"
+#line 9789 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 628bc36..0a39318 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -84,12 +84,14 @@ public class LibraryWindow : AppWindow {
             base.switched_to();
         }
 
+        public override void switching_from() {
+        }
+
         protected override void init_collect_ui_filenames(Gee.List<string> ui_filenames) {
             // We intentionally don't call the base class here since we don't want the
             // top-level menu in photo.ui.
             ui_filenames.add("photo_context.ui");
         }
-        
     }
 
     private string import_dir = Environment.get_home_dir();
@@ -209,7 +211,11 @@ public class LibraryWindow : AppWindow {
         CameraTable.get_instance().camera_added.connect(on_camera_added);
         
         background_progress_bar.set_show_text(true);
-        
+
+        // Need to re-install F8 here as it will overwrite the binding created
+        // by the menu
+        const string[] accels = { "<Primary>f", "F8", null };
+        Application.set_accels_for_action("win.CommonDisplaySearchbar", accels);
     }
 
     ~LibraryWindow() {
@@ -1187,9 +1193,6 @@ public class LibraryWindow : AppWindow {
         
         add(layout);
 
-        var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
-        Application.set_appmenu (builder.get_object ("appmenu") as GLib.Menu);
-
         switch_to_page(start_page);
         start_page.grab_focus();
     }
@@ -1272,6 +1275,9 @@ public class LibraryWindow : AppWindow {
 
         Application.set_menubar (page.get_menubar ());
         set_show_menubar (true);
+        var old = get_settings().gtk_shell_shows_menubar;
+        get_settings().gtk_shell_shows_menubar = !old;
+        get_settings().gtk_shell_shows_menubar = old;
         
         Gtk.Toolbar toolbar = page.get_toolbar();
         if (toolbar != null) {
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index b8ec792..1117bcd 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.32.1, the Vala compiler
+/* OfflinePage.c generated by valac 0.34.4, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,10 +12,10 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #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>
@@ -304,16 +304,6 @@ 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))
@@ -352,6 +342,16 @@ 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))
@@ -462,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -794,10 +795,10 @@ 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 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 void offline_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void offline_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -815,6 +816,8 @@ 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);
@@ -861,14 +864,14 @@ static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offl
 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 865 "OfflinePage.c"
+#line 868 "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"
+#line 875 "OfflinePage.c"
 }
 
 
@@ -933,14 +936,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 937 "OfflinePage.c"
+#line 940 "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 944 "OfflinePage.c"
+#line 947 "OfflinePage.c"
 }
 
 
@@ -960,34 +963,81 @@ 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 964 "OfflinePage.c"
+#line 967 "OfflinePage.c"
 }
 
 
-static void offline_page_real_add_actions (Page* base) {
+static void offline_page_real_add_actions (Page* base, GActionMap* map) {
 	OfflinePage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
+#line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	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"
-	_tmp0_ = app_window_get_instance ();
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	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), _tmp0_);
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	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);
+	_tmp1_ = map;
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 984 "OfflinePage.c"
+	g_action_map_add_action_entries (_tmp1_, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
+#line 987 "OfflinePage.c"
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
+	OfflinePage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
+#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	_tmp0_ = map;
 #line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 1002 "OfflinePage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+		entry_collection = OFFLINE_PAGE_entries;
+#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (OFFLINE_PAGE_entries);
+#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (OFFLINE_PAGE_entries); entry_it = entry_it + 1) {
+#line 1014 "OfflinePage.c"
+			GActionEntry entry = {0};
+#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+			entry = entry_collection[entry_it];
+#line 1018 "OfflinePage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+				_tmp1_ = map;
+#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+				_tmp2_ = entry;
+#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1031 "OfflinePage.c"
+			}
+		}
+	}
+}
+
+
+static gpointer _core_tracker_ref0 (gpointer self) {
+#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 991 "OfflinePage.c"
+#line 1041 "OfflinePage.c"
 }
 
 
@@ -996,17 +1046,17 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	result = _tmp1_;
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1010 "OfflinePage.c"
+#line 1060 "OfflinePage.c"
 }
 
 
@@ -1015,49 +1065,49 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 69 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = selected_count;
-#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 77 "/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 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = selected_count;
-#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp2_ = count;
-#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/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 1031 "OfflinePage.c"
+#line 1081 "OfflinePage.c"
 }
 
 
 static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp12_ = NULL;
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = added;
-#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp0_ != NULL) {
-#line 1048 "OfflinePage.c"
+#line 1098 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp1_ = added;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_source_it = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1061 "OfflinePage.c"
+#line 1111 "OfflinePage.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				MediaSource* source = NULL;
@@ -1068,52 +1118,52 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 				MediaSource* _tmp9_ = NULL;
 				OfflinePageOfflineView* _tmp10_ = NULL;
 				OfflinePageOfflineView* _tmp11_ = NULL;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp3_ = _source_it;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				if (!_tmp4_) {
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1080 "OfflinePage.c"
+#line 1130 "OfflinePage.c"
 				}
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp5_ = _source_it;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp8_ = _tmp7_;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp9_ = source;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp10_ = offline_page_offline_view_new (_tmp9_);
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp11_ = _tmp10_;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/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 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1106 "OfflinePage.c"
+#line 1156 "OfflinePage.c"
 			}
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1110 "OfflinePage.c"
+#line 1160 "OfflinePage.c"
 		}
 	}
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp12_ = removed;
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp12_ != NULL) {
-#line 1117 "OfflinePage.c"
+#line 1167 "OfflinePage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
@@ -1122,32 +1172,32 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 		ViewCollection* _tmp29_ = NULL;
 		ViewCollection* _tmp30_ = NULL;
 		Marker* _tmp31_ = NULL;
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp14_ = _tmp13_;
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp16_ = _tmp15_;
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		marker = _tmp16_;
-#line 1138 "OfflinePage.c"
+#line 1188 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_ = NULL;
 			GeeIterator* _tmp18_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp17_ = removed;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_source_it = _tmp18_;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1151 "OfflinePage.c"
+#line 1201 "OfflinePage.c"
 				GeeIterator* _tmp19_ = NULL;
 				gboolean _tmp20_ = FALSE;
 				MediaSource* source = NULL;
@@ -1159,61 +1209,61 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 				MediaSource* _tmp26_ = NULL;
 				DataView* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp19_ = _source_it;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				if (!_tmp20_) {
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1171 "OfflinePage.c"
+#line 1221 "OfflinePage.c"
 				}
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp21_ = _source_it;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp23_ = marker;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp25_ = _tmp24_;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp26_ = source;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/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 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp28_ = _tmp27_;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1199 "OfflinePage.c"
+#line 1249 "OfflinePage.c"
 			}
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1203 "OfflinePage.c"
+#line 1253 "OfflinePage.c"
 		}
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp30_ = _tmp29_;
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp31_ = marker;
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (marker);
-#line 1217 "OfflinePage.c"
+#line 1267 "OfflinePage.c"
 	}
 }
 
@@ -1221,9 +1271,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 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1227 "OfflinePage.c"
+#line 1277 "OfflinePage.c"
 }
 
 
@@ -1260,198 +1310,198 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	ProgressDialog* _tmp39_ = NULL;
 	AppWindow* _tmp41_ = NULL;
 	AppWindow* _tmp42_ = NULL;
-#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _tmp0_;
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	sources = _tmp3_;
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp4_ = sources;
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp5_ = gee_collection_get_size (_tmp4_);
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp6_ = _tmp5_;
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp6_ == 0) {
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1290 "OfflinePage.c"
+#line 1340 "OfflinePage.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp8_ = _tmp7_;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp9_ = sources;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp10_ = gee_collection_get_size (_tmp9_);
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp11_ = _tmp10_;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/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 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp13_ = !_tmp12_;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp13_) {
-#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
-#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1314 "OfflinePage.c"
+#line 1364 "OfflinePage.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp14_ = app_window_get_instance ();
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp15_ = _tmp14_;
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp15_);
-#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	progress = NULL;
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp16_ = sources;
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp17_ = gee_collection_get_size (_tmp16_);
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp18_ = _tmp17_;
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp18_ >= 20) {
-#line 1334 "OfflinePage.c"
+#line 1384 "OfflinePage.c"
 		AppWindow* _tmp19_ = NULL;
 		AppWindow* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		ProgressDialog* _tmp22_ = NULL;
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp19_ = app_window_get_instance ();
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp20_ = _tmp19_;
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp21_ = _ ("Deleting…");
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/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 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		g_object_ref_sink (_tmp22_);
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (progress);
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		progress = _tmp22_;
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1355 "OfflinePage.c"
+#line 1405 "OfflinePage.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 112 "/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 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	photos = _tmp23_;
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 113 "/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 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	videos = _tmp24_;
-#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp25_ = sources;
-#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp26_ = photos;
-#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp27_ = videos;
-#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/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 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp28_ = progress;
-#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp28_ != NULL) {
-#line 1377 "OfflinePage.c"
+#line 1427 "OfflinePage.c"
 		LibraryPhotoSourceCollection* _tmp29_ = NULL;
 		GeeArrayList* _tmp30_ = NULL;
 		ProgressDialog* _tmp31_ = NULL;
 		VideoSourceCollection* _tmp32_ = NULL;
 		GeeArrayList* _tmp33_ = NULL;
 		ProgressDialog* _tmp34_ = NULL;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp29_ = library_photo_global;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp30_ = photos;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp31_ = progress;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/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 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp32_ = video_global;
-#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp33_ = videos;
-#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp34_ = progress;
-#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/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 1400 "OfflinePage.c"
+#line 1450 "OfflinePage.c"
 	} else {
 		LibraryPhotoSourceCollection* _tmp35_ = NULL;
 		GeeArrayList* _tmp36_ = NULL;
 		VideoSourceCollection* _tmp37_ = NULL;
 		GeeArrayList* _tmp38_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp35_ = library_photo_global;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp36_ = photos;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/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 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp37_ = video_global;
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp38_ = videos;
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 121 "/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 1418 "OfflinePage.c"
+#line 1468 "OfflinePage.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp39_ = progress;
-#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp39_ != NULL) {
-#line 1424 "OfflinePage.c"
+#line 1474 "OfflinePage.c"
 		ProgressDialog* _tmp40_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp40_ = progress;
-#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		progress_dialog_close (_tmp40_);
-#line 1430 "OfflinePage.c"
+#line 1480 "OfflinePage.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp41_ = app_window_get_instance ();
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp42_ = _tmp41_;
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow));
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp42_);
-#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
-#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (photos);
-#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (progress);
-#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (sources);
-#line 1448 "OfflinePage.c"
+#line 1498 "OfflinePage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1455 "OfflinePage.c"
+#line 1505 "OfflinePage.c"
 }
 
 
@@ -1460,17 +1510,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP
 	SearchViewFilter* result = NULL;
 	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	result = _tmp1_;
-#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1474 "OfflinePage.c"
+#line 1524 "OfflinePage.c"
 }
 
 
@@ -1499,21 +1549,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 1503 "OfflinePage.c"
+#line 1553 "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 1510 "OfflinePage.c"
+#line 1560 "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 1517 "OfflinePage.c"
+#line 1567 "OfflinePage.c"
 }
 
 
@@ -1542,7 +1592,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 1546 "OfflinePage.c"
+#line 1596 "OfflinePage.c"
 }
 
 
@@ -1552,14 +1602,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 1556 "OfflinePage.c"
+#line 1606 "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 1563 "OfflinePage.c"
+#line 1613 "OfflinePage.c"
 }
 
 
@@ -1568,7 +1618,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 1572 "OfflinePage.c"
+#line 1622 "OfflinePage.c"
 }
 
 
@@ -1598,6 +1648,8 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((PageClass *) klass)->add_actions = offline_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	((PageClass *) klass)->remove_actions = offline_page_real_remove_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"
 	((PageClass *) klass)->update_actions = offline_page_real_update_actions;
@@ -1605,7 +1657,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 1609 "OfflinePage.c"
+#line 1661 "OfflinePage.c"
 }
 
 
@@ -1617,7 +1669,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 1621 "OfflinePage.c"
+#line 1673 "OfflinePage.c"
 }
 
 
@@ -1647,7 +1699,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 1651 "OfflinePage.c"
+#line 1703 "OfflinePage.c"
 }
 
 
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index bd916d0..1982618 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -56,10 +56,17 @@ public class OfflinePage : CheckerboardPage {
         { "RemoveFromLibrary", on_remove_from_library }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries(entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     public override Core.ViewTracker? get_view_tracker() {
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index a2025d1..1a19cd3 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.34.4, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 8c6cf47..c108bba 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.32.1, the Vala compiler
+/* TrashPage.c generated by valac 0.34.4, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,10 +12,10 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #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>
@@ -304,16 +304,6 @@ 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))
@@ -473,7 +463,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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -807,10 +798,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 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 void trash_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void trash_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -880,21 +871,21 @@ static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_del
 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"
+#line 875 "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"
+#line 882 "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 898 "TrashPage.c"
+#line 889 "TrashPage.c"
 }
 
 
@@ -961,14 +952,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 965 "TrashPage.c"
+#line 956 "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 972 "TrashPage.c"
+#line 963 "TrashPage.c"
 }
 
 
@@ -988,34 +979,81 @@ 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 992 "TrashPage.c"
+#line 983 "TrashPage.c"
 }
 
 
-static void trash_page_real_add_actions (Page* base) {
+static void trash_page_real_add_actions (Page* base, GActionMap* map) {
 	TrashPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
+#line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	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_;
+	_tmp0_ = map;
+#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	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), _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);
+	_tmp1_ = map;
 #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 1012 "TrashPage.c"
+	g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
+#line 1003 "TrashPage.c"
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
+	TrashPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
+#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	_tmp0_ = map;
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 1018 "TrashPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+		entry_collection = TRASH_PAGE_entries;
+#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries);
+#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) {
+#line 1030 "TrashPage.c"
+			GActionEntry entry = {0};
+#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+			entry = entry_collection[entry_it];
+#line 1034 "TrashPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+				_tmp1_ = map;
+#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+				_tmp2_ = entry;
+#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1047 "TrashPage.c"
+			}
+		}
+	}
+}
+
+
+static gpointer _core_tracker_ref0 (gpointer self) {
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1019 "TrashPage.c"
+#line 1057 "TrashPage.c"
 }
 
 
@@ -1024,17 +1062,17 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1038 "TrashPage.c"
+#line 1076 "TrashPage.c"
 }
 
 
@@ -1044,59 +1082,59 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = selected_count;
-#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	has_selected = _tmp0_ > 0;
-#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 75 "/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 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE);
-#line 70 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/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 71 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE);
-#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/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 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = selected_count;
-#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = count;
-#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/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 1070 "TrashPage.c"
+#line 1108 "TrashPage.c"
 }
 
 
 static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp12_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = added;
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp0_ != NULL) {
-#line 1087 "TrashPage.c"
+#line 1125 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp1_ = added;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1100 "TrashPage.c"
+#line 1138 "TrashPage.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				MediaSource* source = NULL;
@@ -1107,52 +1145,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp9_ = NULL;
 				TrashPageTrashView* _tmp10_ = NULL;
 				TrashPageTrashView* _tmp11_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp3_ = _source_it;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp4_) {
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1119 "TrashPage.c"
+#line 1157 "TrashPage.c"
 				}
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp5_ = _source_it;
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp8_ = _tmp7_;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp9_ = source;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp10_ = trash_page_trash_view_new (_tmp9_);
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp11_ = _tmp10_;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/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 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1145 "TrashPage.c"
+#line 1183 "TrashPage.c"
 			}
-#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1149 "TrashPage.c"
+#line 1187 "TrashPage.c"
 		}
 	}
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp12_ = removed;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp12_ != NULL) {
-#line 1156 "TrashPage.c"
+#line 1194 "TrashPage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
@@ -1161,32 +1199,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 		ViewCollection* _tmp29_ = NULL;
 		ViewCollection* _tmp30_ = NULL;
 		Marker* _tmp31_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp14_ = _tmp13_;
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp16_ = _tmp15_;
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		marker = _tmp16_;
-#line 1177 "TrashPage.c"
+#line 1215 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_ = NULL;
 			GeeIterator* _tmp18_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp17_ = removed;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp18_;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1190 "TrashPage.c"
+#line 1228 "TrashPage.c"
 				GeeIterator* _tmp19_ = NULL;
 				gboolean _tmp20_ = FALSE;
 				MediaSource* source = NULL;
@@ -1198,61 +1236,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp26_ = NULL;
 				DataView* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp19_ = _source_it;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp20_) {
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1210 "TrashPage.c"
+#line 1248 "TrashPage.c"
 				}
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp21_ = _source_it;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp23_ = marker;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp25_ = _tmp24_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp26_ = source;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/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 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp28_ = _tmp27_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1238 "TrashPage.c"
+#line 1276 "TrashPage.c"
 			}
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1242 "TrashPage.c"
+#line 1280 "TrashPage.c"
 		}
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp30_ = _tmp29_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp31_ = marker;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_g_object_unref0 (marker);
-#line 1256 "TrashPage.c"
+#line 1294 "TrashPage.c"
 	}
 }
 
@@ -1270,51 +1308,51 @@ static void trash_page_on_restore (TrashPage* self) {
 	GeeCollection* _tmp9_ = NULL;
 	TrashUntrashPhotosCommand* _tmp10_ = NULL;
 	TrashUntrashPhotosCommand* _tmp11_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _tmp0_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp3_) {
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		return;
-#line 1290 "TrashPage.c"
+#line 1328 "TrashPage.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = _tmp4_;
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp11_ = _tmp10_;
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_command_manager_unref0 (_tmp5_);
-#line 1318 "TrashPage.c"
+#line 1356 "TrashPage.c"
 }
 
 
@@ -1323,17 +1361,17 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = _ ("Trash is empty");
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1337 "TrashPage.c"
+#line 1375 "TrashPage.c"
 }
 
 
@@ -1348,55 +1386,55 @@ static void trash_page_on_delete (TrashPage* self) {
 	GeeList* _tmp8_ = NULL;
 	GeeCollection* _tmp9_ = NULL;
 	const gchar* _tmp10_ = NULL;
-#line 104 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = _tmp3_ == 1;
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp4_) {
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1368 "TrashPage.c"
+#line 1406 "TrashPage.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp5_ = _ ("Deleting Photos");
-#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1375 "TrashPage.c"
+#line 1413 "TrashPage.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = _ ("Delete");
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	remove_from_app (_tmp9_, _tmp10_, _tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1393 "TrashPage.c"
+#line 1431 "TrashPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1400 "TrashPage.c"
+#line 1438 "TrashPage.c"
 }
 
 
@@ -1405,17 +1443,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	SearchViewFilter* result = NULL;
 	TrashPageTrashSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1419 "TrashPage.c"
+#line 1457 "TrashPage.c"
 }
 
 
@@ -1444,21 +1482,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 1448 "TrashPage.c"
+#line 1486 "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 1455 "TrashPage.c"
+#line 1493 "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 1462 "TrashPage.c"
+#line 1500 "TrashPage.c"
 }
 
 
@@ -1487,7 +1525,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 1491 "TrashPage.c"
+#line 1529 "TrashPage.c"
 }
 
 
@@ -1497,14 +1535,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 1501 "TrashPage.c"
+#line 1539 "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 1508 "TrashPage.c"
+#line 1546 "TrashPage.c"
 }
 
 
@@ -1513,7 +1551,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 1517 "TrashPage.c"
+#line 1555 "TrashPage.c"
 }
 
 
@@ -1543,6 +1581,8 @@ static void trash_page_class_init (TrashPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((PageClass *) klass)->add_actions = trash_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	((PageClass *) klass)->remove_actions = trash_page_real_remove_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"
 	((PageClass *) klass)->update_actions = trash_page_real_update_actions;
@@ -1552,7 +1592,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 1556 "TrashPage.c"
+#line 1596 "TrashPage.c"
 }
 
 
@@ -1564,7 +1604,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 1568 "TrashPage.c"
+#line 1608 "TrashPage.c"
 }
 
 
@@ -1578,7 +1618,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 1582 "TrashPage.c"
+#line 1622 "TrashPage.c"
 }
 
 
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index 943c5e1..c06fbbf 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -52,10 +52,17 @@ public class TrashPage : CheckerboardPage {
         { "Restore", on_restore }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions(GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     public override Core.ViewTracker? get_view_tracker() {
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 0346c07..0eca1b9 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.34.4, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/main.c b/src/main.c
index 83f5416..d549d88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.32.1, the Vala compiler
+/* main.c generated by valac 0.34.4, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch218_g_error;
+			goto __catch220_g_error;
 		}
 	}
-	goto __finally218;
-	__catch218_g_error:
+	goto __finally220;
+	__catch220_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"
 	}
-	__finally218:
+	__finally220:
 #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 __catch219_g_error;
+					goto __catch221_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 __finally219;
-			__catch219_g_error:
+			goto __finally221;
+			__catch221_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"
 			}
-			__finally219:
+			__finally221:
 #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 __catch220_g_error;
+			goto __catch222_g_error;
 		}
 	}
-	goto __finally220;
-	__catch220_g_error:
+	goto __finally222;
+	__catch222_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1954,7 +1954,7 @@ void editing_exec (const gchar* filename) {
 		return;
 #line 1948 "main.c"
 	}
-	__finally220:
+	__finally222:
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
@@ -2350,17 +2350,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2358 "main.c"
 }
@@ -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 __catch221_g_error;
+			goto __catch223_g_error;
 		}
 	}
-	goto __finally221;
-	__catch221_g_error:
+	goto __finally223;
+	__catch223_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"
 	}
-	__finally221:
+	__finally223:
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
@@ -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 __catch222_g_error;
+				goto __catch224_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 __finally222;
-		__catch222_g_error:
+		goto __finally224;
+		__catch224_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"
 		}
-		__finally222:
+		__finally224:
 #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/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 11ad8c6..ae80b52 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.32.1, the Vala compiler
+/* BmpSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from BmpSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1024,7 +1024,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp4__length1 = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 36e9c88..2b56cbf 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.32.1, the Vala compiler
+/* GRaw.c generated by valac 0.34.4, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -498,7 +498,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp10_ = _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp12_ = _tmp11_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -510,7 +510,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_bytes_unref0 (bytes);
 #line 513 "GRaw.c"
-			goto __catch27_g_error;
+			goto __catch29_g_error;
 		}
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp13_ = _tmp7_;
@@ -526,8 +526,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		_g_bytes_unref0 (bytes);
 #line 528 "GRaw.c"
 	}
-	goto __finally27;
-	__catch27_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_ = NULL;
@@ -548,9 +548,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_error_free0 (err);
 #line 551 "GRaw.c"
-		goto __finally27;
+		goto __finally29;
 	}
-	__finally27:
+	__finally29:
 #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index 010572b..b9e36c1 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.32.1, the Vala compiler
+/* GdkSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from GdkSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -628,11 +628,11 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 631 "GdkSupport.c"
-			goto __catch28_g_error;
+			goto __catch30_g_error;
 		}
 	}
-	goto __finally28;
-	__catch28_g_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* err = NULL;
 		DetectedPhotoInformation* _tmp11_ = NULL;
@@ -650,7 +650,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 652 "GdkSupport.c"
 	}
-	__finally28:
+	__finally30:
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -930,7 +930,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp47__length1 = buffer_length1;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
+			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			bytes_read = (gsize) _tmp48_;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1084,11 +1084,11 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "GdkSupport.c"
-			goto __catch29_g_error;
+			goto __catch31_g_error;
 		}
 	}
-	goto __finally29;
-	__catch29_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* err = NULL;
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1099,7 +1099,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 1101 "GdkSupport.c"
 	}
-	__finally29:
+	__finally31:
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1127,7 +1127,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp69_ = fins;
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 3c86a7a..113c56c 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.32.1, the Vala compiler
+/* JfifSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from JfifSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1870,7 +1870,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = fins;
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	dins = _tmp1_;
 #line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 2f05603..59a0632 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -370,7 +370,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_result_ = _tmp5_;
 #line 372 "PhotoFileAdapter.c"
 		}
-		__finally22:
+		__finally24:
 		{
 			GFile* _tmp6_ = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index 6e05342..24f6bd3 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 8d44d6b..50a71b1 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoFileSniffer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 148df86..7748685 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.32.1, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.34.4, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,7 +9,7 @@
 /**/
 /* PhotoMetadata*/
 /**/
-/* PhotoMetadata is a wrapper class around gexiv2.  The reasoning for this is (a) to facilitiate*/
+/* PhotoMetadata is a wrapper class around gexiv2.  The reasoning for this is (a) to facilitate*/
 /* interface changes to meet Shotwell's requirements without needing modifications of the library*/
 /* itself, and (b) some requirements for this class (i.e. obtaining raw metadata) is not available*/
 /* in gexiv2, and so must be done by hand.*/
@@ -2058,7 +2058,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2068,7 +2068,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2071 "PhotoMetadata.c"
-			goto __catch23_g_error;
+			goto __catch25_g_error;
 		}
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = _tmp2_;
@@ -2084,8 +2084,8 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		return result;
 #line 2086 "PhotoMetadata.c"
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -2113,7 +2113,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		return result;
 #line 2115 "PhotoMetadata.c"
 	}
-	__finally23:
+	__finally25:
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_propagate_error (error, _inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5336,7 +5336,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5335 "PhotoMetadata.c"
-					goto __catch24_g_error;
+					goto __catch26_g_error;
 				}
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp5_;
@@ -5382,7 +5382,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5381 "PhotoMetadata.c"
-					goto __catch24_g_error;
+					goto __catch26_g_error;
 				}
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = _tmp9_;
@@ -5400,8 +5400,8 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 			}
 		}
 	}
-	goto __finally24;
-	__catch24_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -5432,7 +5432,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		return result;
 #line 5430 "PhotoMetadata.c"
 	}
-	__finally24:
+	__finally26:
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (value);
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6719,19 +6719,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 6732 "PhotoMetadata.c"
 }
@@ -6741,17 +6741,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 6752 "PhotoMetadata.c"
 }
@@ -7296,11 +7296,11 @@ static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 7301 "PhotoMetadata.c"
 	{
@@ -7315,98 +7315,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7332 "PhotoMetadata.c"
-				goto __catch25_g_regex_error;
+				goto __catch27_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7341 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7357 "PhotoMetadata.c"
-				goto __catch25_g_regex_error;
+				goto __catch27_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7368 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 7382 "PhotoMetadata.c"
 	}
-	goto __finally25;
-	__catch25_g_regex_error:
+	goto __finally27;
+	__catch27_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 7396 "PhotoMetadata.c"
 	}
-	__finally25:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally27:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 7407 "PhotoMetadata.c"
 	}
@@ -7420,37 +7420,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 7431 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 7439 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 7451 "PhotoMetadata.c"
 	}
@@ -7470,112 +7470,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 7475 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 7481 "PhotoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 7485 "PhotoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 7489 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 7501 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 7511 "PhotoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 7517 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 7531 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 7541 "PhotoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 7547 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 7556 "PhotoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 7576 "PhotoMetadata.c"
 }
@@ -8267,7 +8267,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 #line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8265 "PhotoMetadata.c"
-								goto __catch26_g_error;
+								goto __catch28_g_error;
 							}
 #line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp23_ = transformed_values;
@@ -8279,8 +8279,8 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							_g_object_unref0 (transformed);
 #line 8276 "PhotoMetadata.c"
 						}
-						goto __finally26;
-						__catch26_g_error:
+						goto __finally28;
+						__catch28_g_error:
 						{
 							GError* _error_ = NULL;
 							const gchar* _tmp25_ = NULL;
@@ -8302,7 +8302,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							_g_error_free0 (_error_);
 #line 8299 "PhotoMetadata.c"
 						}
-						__finally26:
+						__finally28:
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 814ea6b..7764415 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -7,7 +7,7 @@
 //
 // PhotoMetadata
 //
-// PhotoMetadata is a wrapper class around gexiv2.  The reasoning for this is (a) to facilitiate
+// PhotoMetadata is a wrapper class around gexiv2.  The reasoning for this is (a) to facilitate
 // interface changes to meet Shotwell's requirements without needing modifications of the library
 // itself, and (b) some requirements for this class (i.e. obtaining raw metadata) is not available
 // in gexiv2, and so must be done by hand.
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index 434f905..a5a2b83 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.32.1, the Vala compiler
+/* Photos.c generated by valac 0.34.4, the Vala compiler
  * generated from Photos.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 98d4cd2..3229f52 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.32.1, the Vala compiler
+/* PngSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1020,7 +1020,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp4__length1 = file_lead_sequence_length1;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index f46b61e..6569e3b 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.32.1, the Vala compiler
+/* RawSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1745,7 +1745,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1748 "RawSupport.c"
-				goto __catch30_graw_exception;
+				goto __catch32_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1768,7 +1768,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1771 "RawSupport.c"
-				goto __catch30_graw_exception;
+				goto __catch32_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1791,7 +1791,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1794 "RawSupport.c"
-				goto __catch30_graw_exception;
+				goto __catch32_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1806,8 +1806,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 1807 "RawSupport.c"
 		}
 	}
-	goto __finally30;
-	__catch30_graw_exception:
+	goto __finally32;
+	__catch32_graw_exception:
 	{
 		GError* exception = NULL;
 		GError* _tmp11_ = NULL;
@@ -1848,9 +1848,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
 #line 1851 "RawSupport.c"
-		goto __finally30;
+		goto __finally32;
 	}
-	__finally30:
+	__finally32:
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1921,7 +1921,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1924 "RawSupport.c"
-			goto __catch31_g_error;
+			goto __catch33_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp32_ = detected;
@@ -1937,8 +1937,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_media_metadata_unref0 (_tmp29_);
 #line 1939 "RawSupport.c"
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* err = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1949,7 +1949,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 1951 "RawSupport.c"
 	}
-	__finally31:
+	__finally33:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 2e1282e..1b70973 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.32.1, the Vala compiler
+/* TiffSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1601,7 +1601,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 1602 "TiffSupport.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	dins = _tmp3_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index 96920a9..57e5069 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from DataImportsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index a542964..2571817 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.32.1, the Vala compiler
+/* ManifestWidget.c generated by valac 0.34.4, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -245,19 +245,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 263 "ManifestWidget.c"
 }
@@ -1402,7 +1402,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp46_ = _tmp45_;
 #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_TYPE_ICON, GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
+				_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 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp48_ = _tmp47_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1428,7 +1428,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1431 "ManifestWidget.c"
-							goto __catch34_g_error;
+							goto __catch36_g_error;
 						}
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
@@ -1442,8 +1442,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_object_unref0 (_tmp50_);
 #line 1444 "ManifestWidget.c"
 					}
-					goto __finally34;
-					__catch34_g_error:
+					goto __finally36;
+					__catch36_g_error:
 					{
 						GError* err = NULL;
 						PluginsExtensionPoint* _tmp54_ = NULL;
@@ -1471,7 +1471,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_error_free0 (err);
 #line 1473 "ManifestWidget.c"
 					}
-					__finally34:
+					__finally36:
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2187,7 +2187,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+	_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 2194 "ManifestWidget.c"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 245a6b2..983b44c 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.32.1, the Vala compiler
+/* Plugins.c generated by valac 0.34.4, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1894,11 +1894,11 @@ void plugins_init (GError** error) {
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1896 "Plugins.c"
-						goto __catch32_g_error;
+						goto __catch34_g_error;
 					}
 				}
-				goto __finally32;
-				__catch32_g_error:
+				goto __finally34;
+				__catch34_g_error:
 				{
 					GError* err = NULL;
 					GFile* _tmp13_ = NULL;
@@ -1928,7 +1928,7 @@ void plugins_init (GError** error) {
 					_g_error_free0 (err);
 #line 1929 "Plugins.c"
 				}
-				__finally32:
+				__finally34:
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3801,11 +3801,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3803 "Plugins.c"
-							goto __catch33_g_error;
+							goto __catch35_g_error;
 						}
 					}
-					goto __finally33;
-					__catch33_g_error:
+					goto __finally35;
+					__catch35_g_error:
 					{
 						GError* err = NULL;
 						GFile* _tmp18_ = NULL;
@@ -3835,7 +3835,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_error_free0 (err);
 #line 3836 "Plugins.c"
 					}
-					__finally33:
+					__finally35:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index e2e22cb..22cfa5a 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from PublishingInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c
index 9357a68..dc6fb3b 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from SpitInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c
index 3465427..497024d 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.32.1, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.34.4, the Vala compiler
  * generated from StandardHostInterface.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c
index aedb555..128f648 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.34.4, the Vala compiler
  * generated from TransitionsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -726,7 +726,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 731 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the starting pixbuf on the display.
@@ -734,7 +734,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 739 "TransitionsInterfaces.c"
 	/**
 	     * Returns the ending pixbuf (the pixbuf that the transition should result in).
@@ -742,7 +742,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 747 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the ending pixbuf on the display.
@@ -750,7 +750,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 755 "TransitionsInterfaces.c"
 	/**
 	     * Returns the background color of the viewport.
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 329e415..690d2b3 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.32.1, the Vala compiler
+/* APIGlue.c generated by valac 0.34.4, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -416,11 +416,11 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 419 "APIGlue.c"
-			goto __catch36_g_error;
+			goto __catch38_g_error;
 		}
 	}
-	goto __finally36;
-	__catch36_g_error:
+	goto __finally38;
+	__catch38_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally36:
+	__finally38:
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -692,11 +692,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 694 "APIGlue.c"
-				goto __catch37_g_error;
+				goto __catch39_g_error;
 			}
 		}
-		goto __finally37;
-		__catch37_g_error:
+		goto __finally39;
+		__catch39_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_ = NULL;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_g_error_free0 (err);
 #line 727 "APIGlue.c"
-			goto __finally37;
+			goto __finally39;
 		}
-		__finally37:
+		__finally39:
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -882,11 +882,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "APIGlue.c"
-					goto __catch38_g_error;
+					goto __catch40_g_error;
 				}
 			}
-			goto __finally38;
-			__catch38_g_error:
+			goto __finally40;
+			__catch40_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_ = NULL;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_error_free0 (err);
 #line 916 "APIGlue.c"
-				goto __finally38;
+				goto __finally40;
 			}
-			__finally38:
+			__finally40:
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index fc14775..ca7ade6 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.32.1, the Vala compiler
+/* Publishing.c generated by valac 0.34.4, the Vala compiler
  * generated from Publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 94f48ea..49208ca 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.32.1, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.34.4, the Vala compiler
  * generated from PublishingPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1273,7 +1273,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1272 "PublishingPluginHost.c"
-							goto __catch35_spit_publishing_publishing_error;
+							goto __catch37_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1293,8 +1293,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1291 "PublishingPluginHost.c"
 				}
-				goto __finally35;
-				__catch35_spit_publishing_publishing_error:
+				goto __finally37;
+				__catch37_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_ = NULL;
@@ -1331,7 +1331,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1329 "PublishingPluginHost.c"
 				}
-				__finally35:
+				__finally37:
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 36d6265..311216d 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.32.1, the Vala compiler
+/* PublishingUI.c generated by valac 0.34.4, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -478,9 +478,9 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 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_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static gint __lambda15_ (void* a, void* b);
+static gint __lambda14_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda15____compar_fn_t (void* key1, void* key2);
+static gint ___lambda14____compar_fn_t (void* key1, void* key2);
 static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
 static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
 static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
@@ -1643,7 +1643,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 #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 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp43_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+	_tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2201,7 +2201,7 @@ static void _vala_array_add56 (SpitPublishingService*** array, int* length, int*
 }
 
 
-static gint __lambda15_ (void* a, void* b) {
+static gint __lambda14_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
@@ -2226,9 +2226,9 @@ static gint __lambda15_ (void* a, void* b) {
 }
 
 
-static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda14____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda15_ (key1, key2);
+	result = __lambda14_ (key1, key2);
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
 #line 2235 "PublishingUI.c"
@@ -2397,7 +2397,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26__length1 = loaded_services_length1;
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
+	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda14____compar_fn_t);
 #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = loaded_services;
 #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 9956e8d..c202931 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1014,7 +1014,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1017 "Branch.c"
-			goto __catch73_g_error;
+			goto __catch75_g_error;
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = self->priv->builder;
@@ -1038,8 +1038,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_object_unref0 (model);
 #line 1040 "Branch.c"
 	}
-	goto __finally73;
-	__catch73_g_error:
+	goto __finally75;
+	__catch75_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp7_ = NULL;
@@ -1076,7 +1076,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_error_free0 (_error_);
 #line 1078 "Branch.c"
 	}
-	__finally73:
+	__finally75:
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 278f4f0..91d066e 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.34.4, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1779,19 +1779,19 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1797 "SavedSearchDialog.c"
 }
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 1dc2f9b..d9e8593 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.34.4, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -13,9 +13,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 
 
 #define TYPE_VIEW_MANAGER (view_manager_get_type ())
@@ -371,16 +371,6 @@ 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))
@@ -432,6 +422,16 @@ 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))
@@ -508,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -783,10 +784,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 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);
+static void saved_search_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void saved_search_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
@@ -803,6 +804,7 @@ 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);
@@ -826,7 +828,7 @@ static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _save
 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 830 "SavedSearchPage.c"
+#line 832 "SavedSearchPage.c"
 }
 
 
@@ -853,14 +855,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 857 "SavedSearchPage.c"
+#line 859 "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 864 "SavedSearchPage.c"
+#line 866 "SavedSearchPage.c"
 }
 
 
@@ -884,7 +886,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 888 "SavedSearchPage.c"
+#line 890 "SavedSearchPage.c"
 }
 
 
@@ -897,14 +899,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 901 "SavedSearchPage.c"
+#line 903 "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 908 "SavedSearchPage.c"
+#line 910 "SavedSearchPage.c"
 }
 
 
@@ -916,7 +918,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 920 "SavedSearchPage.c"
+#line 922 "SavedSearchPage.c"
 }
 
 
@@ -935,21 +937,21 @@ 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"
+#line 941 "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"
+#line 948 "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"
+#line 955 "SavedSearchPage.c"
 }
 
 
@@ -980,7 +982,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 984 "SavedSearchPage.c"
+#line 986 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_ = NULL;
@@ -1009,7 +1011,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 1013 "SavedSearchPage.c"
+#line 1015 "SavedSearchPage.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -1031,7 +1033,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 1035 "SavedSearchPage.c"
+#line 1037 "SavedSearchPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp13_ = _sources_it;
@@ -1063,24 +1065,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 1067 "SavedSearchPage.c"
+#line 1069 "SavedSearchPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 1071 "SavedSearchPage.c"
+#line 1073 "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");
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 1077 "SavedSearchPage.c"
+#line 1079 "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 1084 "SavedSearchPage.c"
+#line 1086 "SavedSearchPage.c"
 }
 
 
@@ -1110,13 +1112,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 1114 "SavedSearchPage.c"
+#line 1116 "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 1120 "SavedSearchPage.c"
+#line 1122 "SavedSearchPage.c"
 	}
 }
 
@@ -1141,7 +1143,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 1145 "SavedSearchPage.c"
+#line 1147 "SavedSearchPage.c"
 }
 
 
@@ -1161,64 +1163,111 @@ 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 1165 "SavedSearchPage.c"
+#line 1167 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_add_actions (Page* base) {
+static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 	SavedSearchPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
+#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	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"
-	_tmp0_ = app_window_get_instance ();
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = _tmp0_;
+	_tmp0_ = map;
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	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), _tmp0_);
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	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);
+	_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 1185 "SavedSearchPage.c"
+	g_action_map_add_action_entries (_tmp1_, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self);
+#line 1187 "SavedSearchPage.c"
+}
+
+
+static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) {
+	SavedSearchPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	_tmp0_ = map;
+#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	PAGE_CLASS (saved_search_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+#line 1202 "SavedSearchPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+		entry_collection = SAVED_SEARCH_PAGE_entries;
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries);
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries); entry_it = entry_it + 1) {
+#line 1214 "SavedSearchPage.c"
+			GActionEntry entry = {0};
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+			entry = entry_collection[entry_it];
+#line 1218 "SavedSearchPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+				_tmp1_ = map;
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+				_tmp2_ = entry;
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1231 "SavedSearchPage.c"
+			}
+		}
+	}
 }
 
 
 static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 	SavedSearch* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
-#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
-#line 1200 "SavedSearchPage.c"
+#line 1249 "SavedSearchPage.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
 		DeleteSavedSearchCommand* _tmp5_ = NULL;
 		DeleteSavedSearchCommand* _tmp6_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp3_ = _tmp2_;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp4_ = self->priv->search;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp6_ = _tmp5_;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1222 "SavedSearchPage.c"
+#line 1271 "SavedSearchPage.c"
 	}
 }
 
@@ -1227,19 +1276,19 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	SavedSearch* _tmp2_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = _tmp0_;
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp2_ = self->priv->search;
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	library_window_rename_search_in_sidebar (_tmp1_, _tmp2_);
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1243 "SavedSearchPage.c"
+#line 1292 "SavedSearchPage.c"
 }
 
 
@@ -1247,19 +1296,19 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	SavedSearchDialog* ssd = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = saved_search_dialog_new_edit_existing (_tmp0_);
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	ssd = _tmp1_;
-#line 73 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_dialog_show (ssd);
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 1263 "SavedSearchPage.c"
+#line 1312 "SavedSearchPage.c"
 }
 
 
@@ -1267,21 +1316,21 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou
 	SavedSearchPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 85 "/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"
+#line 86 "/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"
+#line 87 "/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"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = selected_count;
-#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = count;
-#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 89 "/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 1285 "SavedSearchPage.c"
+#line 1334 "SavedSearchPage.c"
 }
 
 
@@ -1299,17 +1348,19 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	((PageClass *) klass)->add_actions = saved_search_page_real_add_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	((PageClass *) klass)->remove_actions = saved_search_page_real_remove_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 1306 "SavedSearchPage.c"
+#line 1357 "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 1313 "SavedSearchPage.c"
+#line 1364 "SavedSearchPage.c"
 }
 
 
@@ -1321,7 +1372,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 1325 "SavedSearchPage.c"
+#line 1376 "SavedSearchPage.c"
 }
 
 
diff --git a/src/searches/SavedSearchPage.vala b/src/searches/SavedSearchPage.vala
index c57ec7d..9267137 100644
--- a/src/searches/SavedSearchPage.vala
+++ b/src/searches/SavedSearchPage.vala
@@ -53,12 +53,20 @@ public class SavedSearchPage : CollectionPage {
         { "DeleteSearch", on_delete_search }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions(GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries(entries, this);
     }
-    
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
+    }
+
+
     private void on_delete_search() {
         if (Dialogs.confirm_delete_saved_search(search))
             AppWindow.get_command_manager().execute(new DeleteSavedSearchCommand(search));
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 7da26c1..eea8d74 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.32.1, the Vala compiler
+/* SearchBoolean.c generated by valac 0.34.4, the Vala compiler
  * generated from SearchBoolean.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2305,17 +2305,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2320 "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 __catch74_database_error;
+				goto __catch76_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 __finally74;
-	__catch74_database_error:
+	goto __finally76;
+	__catch76_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"
 	}
-	__finally74:
+	__finally76:
 #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 __catch75_database_error;
+				goto __catch77_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 __finally75;
-	__catch75_database_error:
+	goto __finally77;
+	__catch77_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"
 	}
-	__finally75:
+	__finally77:
 #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 __catch76_database_error;
+				goto __catch78_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 __finally76;
-	__catch76_database_error:
+	goto __finally78;
+	__catch78_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"
 	}
-	__finally76:
+	__finally78:
 #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 __catch77_database_error;
+				goto __catch79_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 __finally77;
-	__catch77_database_error:
+	goto __finally79;
+	__catch79_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"
 	}
-	__finally77:
+	__finally79:
 #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 __catch78_database_error;
+				goto __catch80_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 __finally78;
-	__catch78_database_error:
+	goto __finally80;
+	__catch80_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"
 	}
-	__finally78:
+	__finally80:
 #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/searches/Searches.c b/src/searches/Searches.c
index 1ab6b90..bb0f199 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.32.1, the Vala compiler
+/* Searches.c generated by valac 0.34.4, the Vala compiler
  * generated from Searches.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c
index 10f7a72..798377f 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index caa621c..8edbd4c 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.32.1, the Vala compiler
+/* Entry.c generated by valac 0.34.4, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index 888a70c..f7f7009 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.32.1, the Vala compiler
+/* Sidebar.c generated by valac 0.34.4, the Vala compiler
  * generated from Sidebar.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index f297897..6a28a5f 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.32.1, the Vala compiler
+/* Tree.c generated by valac 0.34.4, the Vala compiler
  * generated from Tree.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1222,7 +1222,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1225 "Tree.c"
-			goto __catch48_g_error;
+			goto __catch50_g_error;
 		}
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->builder;
@@ -1264,8 +1264,8 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_object_unref0 (model);
 #line 1266 "Tree.c"
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally50;
+	__catch50_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp10_ = NULL;
@@ -1302,7 +1302,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_error_free0 (_error_);
 #line 1304 "Tree.c"
 	}
-	__finally48:
+	__finally50:
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5269,7 +5269,8 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	GtkMenu* _tmp14_ = NULL;
 	GtkMenu* _tmp15_ = NULL;
 	GtkMenu* _tmp16_ = NULL;
-	GdkEventButton* _tmp17_ = NULL;
+	GtkWidget* _tmp17_ = NULL;
+	GdkEventButton* _tmp19_ = NULL;
 #line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5290,7 +5291,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5294 "Tree.c"
+#line 5295 "Tree.c"
 	}
 #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
@@ -5312,7 +5313,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5316 "Tree.c"
+#line 5317 "Tree.c"
 	}
 #line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
@@ -5326,13 +5327,13 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	_tmp10_ = selectable;
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5330 "Tree.c"
+#line 5331 "Tree.c"
 		SidebarSelectableEntry* _tmp11_ = NULL;
 #line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
 #line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5336 "Tree.c"
+#line 5337 "Tree.c"
 	}
 #line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
@@ -5358,59 +5359,69 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5362 "Tree.c"
+#line 5363 "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"
+	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	if (_tmp17_ == NULL) {
+#line 5371 "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"
+#line 849 "/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* _tmp23_ = NULL;
+#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 5377 "Tree.c"
+	}
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp19_ = event;
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	if (_tmp19_ != NULL) {
+#line 5383 "Tree.c"
+		GtkMenu* _tmp20_ = NULL;
+		GdkEventButton* _tmp21_ = NULL;
+		guint _tmp22_ = 0U;
+		GdkEventButton* _tmp23_ = NULL;
 		guint32 _tmp24_ = 0U;
 #line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = context_menu;
+		_tmp20_ = context_menu;
 #line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp24_ = gtk_get_current_event_time ();
+		_tmp21_ = event;
 #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"
-	}
+		_tmp22_ = _tmp21_->button;
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp23_ = event;
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp24_ = _tmp23_->time;
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
+#line 5401 "Tree.c"
+	} else {
+		GtkMenu* _tmp25_ = NULL;
+		guint32 _tmp26_ = 0U;
 #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = TRUE;
+		_tmp25_ = context_menu;
 #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (context_menu);
+		_tmp26_ = gtk_get_current_event_time ();
 #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
+#line 5411 "Tree.c"
+	}
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	result = TRUE;
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_g_object_unref0 (context_menu);
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selectable);
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (contextable);
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5414 "Tree.c"
+#line 5425 "Tree.c"
 }
 
 
@@ -5421,27 +5432,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	guint _tmp2_ = 0U;
 	GdkEventButton* _tmp3_ = NULL;
 	guint32 _tmp4_ = 0U;
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = event;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_->button;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = event;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->time;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5445 "Tree.c"
+#line 5456 "Tree.c"
 }
 
 
@@ -5458,129 +5469,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	GtkTreePath* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 865 "/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 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_return_val_if_fail (path != NULL, FALSE);
 #line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_return_val_if_fail (path != NULL, FALSE);
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5484 "Tree.c"
+#line 5495 "Tree.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
-#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	should_allow_toggle = _tmp3_;
-#line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/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 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5498 "Tree.c"
+#line 5509 "Tree.c"
 		GtkTreeStore* _tmp8_ = NULL;
 		GtkTreeIter _tmp9_ = {0};
 		gboolean _tmp10_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = *iter;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/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 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5510 "Tree.c"
+#line 5521 "Tree.c"
 	} else {
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5514 "Tree.c"
+#line 5525 "Tree.c"
 	}
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5518 "Tree.c"
+#line 5529 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		SidebarEntry* _tmp12_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5527 "Tree.c"
+#line 5538 "Tree.c"
 	} else {
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5531 "Tree.c"
+#line 5542 "Tree.c"
 	}
-#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5535 "Tree.c"
+#line 5546 "Tree.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = _tmp13_ + 1;
-#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = self->priv->expander_special_count;
-#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp14_ == 1) {
 #line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		if (_tmp14_ == 1) {
+#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5552 "Tree.c"
+#line 5563 "Tree.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
-#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5559 "Tree.c"
+#line 5570 "Tree.c"
 		}
 	} else {
-#line 889 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 891 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5564 "Tree.c"
+#line 5575 "Tree.c"
 	}
-#line 892 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
-#line 892 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp16_) {
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5576 "Tree.c"
+#line 5587 "Tree.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5584 "Tree.c"
+#line 5595 "Tree.c"
 }
 
 
@@ -5597,120 +5608,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	guint _tmp8_ = 0U;
 	GdkEventButton* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 899 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp1_;
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5615 "Tree.c"
+#line 5626 "Tree.c"
 		GdkEventButton* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5624 "Tree.c"
+#line 5635 "Tree.c"
 	} else {
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5628 "Tree.c"
+#line 5639 "Tree.c"
 	}
-#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5638 "Tree.c"
+#line 5649 "Tree.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->button;
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5646 "Tree.c"
+#line 5657 "Tree.c"
 		GdkEventButton* _tmp9_ = NULL;
 		GdkEventType _tmp10_ = 0;
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5655 "Tree.c"
+#line 5666 "Tree.c"
 	} else {
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5659 "Tree.c"
+#line 5670 "Tree.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5663 "Tree.c"
+#line 5674 "Tree.c"
 		GtkTreePath* _tmp11_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5669 "Tree.c"
+#line 5680 "Tree.c"
 			GtkTreePath* _tmp12_ = NULL;
 			GdkEventButton* _tmp13_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
-#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
-#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5678 "Tree.c"
+#line 5689 "Tree.c"
 		} else {
 			GdkEventButton* _tmp14_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5685 "Tree.c"
+#line 5696 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
 		GdkEventButton* _tmp16_ = NULL;
 		guint _tmp17_ = 0U;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5697 "Tree.c"
+#line 5708 "Tree.c"
 			GdkEventButton* _tmp18_ = NULL;
 			GdkEventType _tmp19_ = 0;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5706 "Tree.c"
+#line 5717 "Tree.c"
 		} else {
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5710 "Tree.c"
+#line 5721 "Tree.c"
 		}
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5714 "Tree.c"
+#line 5725 "Tree.c"
 			GtkTreePath* _tmp20_ = NULL;
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp23_ = NULL;
@@ -5728,226 +5739,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			GtkTreeStore* _tmp55_ = NULL;
 			GtkTreePath* _tmp56_ = NULL;
 			GtkTreeRowReference* _tmp57_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5736 "Tree.c"
+#line 5747 "Tree.c"
 				GdkEventButton* _tmp21_ = NULL;
 				gboolean _tmp22_ = FALSE;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp21_ = event;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 918 "/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 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp22_;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5753 "Tree.c"
+#line 5764 "Tree.c"
 			}
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			wrapper = _tmp24_;
 #line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			wrapper = _tmp24_;
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = wrapper;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5765 "Tree.c"
+#line 5776 "Tree.c"
 				GdkEventButton* _tmp26_ = NULL;
 				gboolean _tmp27_ = FALSE;
-#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = event;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/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 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp27_;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5784 "Tree.c"
+#line 5795 "Tree.c"
 			}
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp30_ = _tmp29_->entry;
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5794 "Tree.c"
+#line 5805 "Tree.c"
 			} else {
 				SidebarTreeEntryWrapper* _tmp31_ = NULL;
 				SidebarEntry* _tmp32_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5804 "Tree.c"
+#line 5815 "Tree.c"
 			}
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5808 "Tree.c"
+#line 5819 "Tree.c"
 				GtkTreePath* _tmp33_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5814 "Tree.c"
+#line 5825 "Tree.c"
 			}
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5820 "Tree.c"
+#line 5831 "Tree.c"
 				const GtkTreeRowReference* _tmp37_ = NULL;
 				GtkTreePath* _tmp38_ = NULL;
 				GtkTreePath* _tmp39_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp39_ = _tmp38_;
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = _tmp39_ != NULL;
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5834 "Tree.c"
+#line 5845 "Tree.c"
 			} else {
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5838 "Tree.c"
+#line 5849 "Tree.c"
 			}
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5842 "Tree.c"
+#line 5853 "Tree.c"
 				const GtkTreeRowReference* _tmp40_ = NULL;
 				GtkTreePath* _tmp41_ = NULL;
 				GtkTreePath* _tmp42_ = NULL;
 				GtkTreePath* _tmp43_ = NULL;
 				gint _tmp44_ = 0;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp42_ = _tmp41_;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp43_ = path;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = _tmp44_ == 0;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5862 "Tree.c"
+#line 5873 "Tree.c"
 			} else {
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5866 "Tree.c"
+#line 5877 "Tree.c"
 			}
-#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5870 "Tree.c"
+#line 5881 "Tree.c"
 				GtkCellRendererText* _tmp45_ = NULL;
 				GdkEventButton* _tmp46_ = NULL;
 				gboolean _tmp47_ = FALSE;
-#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
-#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp46_ = event;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/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 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp47_;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5890 "Tree.c"
+#line 5901 "Tree.c"
 			}
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp50_ = _tmp49_->entry;
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5898 "Tree.c"
+#line 5909 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp51_ = NULL;
 				SidebarEntry* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp52_ = _tmp51_->entry;
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/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 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 5910 "Tree.c"
+#line 5921 "Tree.c"
 			} else {
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 5914 "Tree.c"
+#line 5925 "Tree.c"
 			}
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 5918 "Tree.c"
+#line 5929 "Tree.c"
 				GtkCellRendererText* _tmp54_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5924 "Tree.c"
+#line 5935 "Tree.c"
 			}
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = path;
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 952 "/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 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			self->priv->old_path_ref = _tmp57_;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 5938 "Tree.c"
+#line 5949 "Tree.c"
 		}
 	}
-#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = event;
-#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/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 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp59_;
-#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5951 "Tree.c"
+#line 5962 "Tree.c"
 }
 
 
@@ -5958,53 +5969,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 956 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 956 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/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 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 5988 "Tree.c"
+#line 5999 "Tree.c"
 			default:
 			{
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5995 "Tree.c"
+#line 6006 "Tree.c"
 			}
 		}
 	} else {
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6001 "Tree.c"
+#line 6012 "Tree.c"
 			default:
 			{
-#line 965 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
-#line 965 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6008 "Tree.c"
+#line 6019 "Tree.c"
 			}
 		}
 	}
@@ -6019,134 +6030,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6031 "Tree.c"
+#line 6042 "Tree.c"
 	GdkEventKey* _tmp15_ = NULL;
 	gboolean _tmp16_ = FALSE;
-#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/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 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6052 "Tree.c"
+#line 6063 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp6_ = NULL;
 				GtkTreePath* _tmp7_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
-#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp6_;
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp7_ = path;
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6066 "Tree.c"
+#line 6077 "Tree.c"
 					GtkTreePath* _tmp8_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6072 "Tree.c"
+#line 6083 "Tree.c"
 				}
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6080 "Tree.c"
+#line 6091 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6086 "Tree.c"
+#line 6097 "Tree.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
-#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6096 "Tree.c"
+#line 6107 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6102 "Tree.c"
+#line 6113 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
 				GtkTreePath* _tmp12_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
-#line 983 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				path = _tmp10_;
 #line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+				path = _tmp10_;
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = path;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6117 "Tree.c"
+#line 6128 "Tree.c"
 					GtkTreePath* _tmp13_ = NULL;
 					gboolean _tmp14_ = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6126 "Tree.c"
+#line 6137 "Tree.c"
 				} else {
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6130 "Tree.c"
+#line 6141 "Tree.c"
 				}
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6138 "Tree.c"
+#line 6149 "Tree.c"
 			}
 		}
 	}
-#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = event;
-#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/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 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6150 "Tree.c"
+#line 6161 "Tree.c"
 }
 
 
@@ -6157,41 +6168,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	SidebarEntry* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6175 "Tree.c"
+#line 6186 "Tree.c"
 	}
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6187 "Tree.c"
+#line 6198 "Tree.c"
 	}
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp4_;
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6195 "Tree.c"
+#line 6206 "Tree.c"
 }
 
 
@@ -6204,57 +6215,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp2_ = NULL;
 	GtkTreePath* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/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 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	cursor_column = _tmp2_;
 #line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	cursor_column = _tmp2_;
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6228 "Tree.c"
+#line 6239 "Tree.c"
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewColumn* _tmp6_ = NULL;
 		GtkCellRendererText* _tmp7_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = cursor_column;
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = self->priv->text_renderer;
-#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 1009 "/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 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1011 "/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 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6248 "Tree.c"
+#line 6259 "Tree.c"
 	}
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6258 "Tree.c"
+#line 6269 "Tree.c"
 }
 
 
@@ -6267,45 +6278,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1015 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6291 "Tree.c"
+#line 6302 "Tree.c"
 	}
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/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 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp5_);
 #line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_gtk_tree_path_free0 (_tmp5_);
+#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6309 "Tree.c"
+#line 6320 "Tree.c"
 }
 
 
@@ -6316,55 +6327,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	SidebarInternalDragSourceEntry* _tmp6_ = NULL;
 	SidebarInternalDragSourceEntry* _tmp16_ = NULL;
 	GtkSelectionData* _tmp17_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_return_if_fail (selection_data != NULL);
 #line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	drag_source = NULL;
+	g_return_if_fail (selection_data != NULL);
 #line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	drag_source = NULL;
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->internal_drag_source_entry;
-#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6332 "Tree.c"
+#line 6343 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_ = NULL;
 		SidebarSelectableEntry* _tmp2_ = NULL;
 		SidebarSelectableEntry* _tmp3_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/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 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		selectable = _tmp2_;
 #line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		selectable = _tmp2_;
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = selectable;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6347 "Tree.c"
+#line 6358 "Tree.c"
 			SidebarEntry* _tmp4_ = NULL;
 			SidebarInternalDragSourceEntry* _tmp5_ = NULL;
-#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
-#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1035 "/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 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6358 "Tree.c"
+#line 6369 "Tree.c"
 		}
-#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6362 "Tree.c"
+#line 6373 "Tree.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6368 "Tree.c"
+#line 6379 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		GtkTreePath* _tmp8_ = NULL;
@@ -6376,81 +6387,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		SidebarEntry* _tmp13_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp14_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp15_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selected_path = _tmp7_;
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = selected_path;
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6394 "Tree.c"
+#line 6405 "Tree.c"
 		}
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp10_;
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == NULL) {
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6414 "Tree.c"
+#line 6425 "Tree.c"
 		}
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->entry;
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/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 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (drag_source);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		drag_source = _tmp14_;
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = drag_source;
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_ == NULL) {
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6438 "Tree.c"
+#line 6449 "Tree.c"
 		}
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6444 "Tree.c"
+#line 6455 "Tree.c"
 	}
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = selection_data;
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6454 "Tree.c"
+#line 6465 "Tree.c"
 }
 
 
@@ -6483,87 +6494,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	GdkDragContext* _tmp57_ = NULL;
 	gboolean _tmp58_ = FALSE;
 	guint _tmp59_ = 0U;
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = x;
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = y;
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/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 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp2_;
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp3_;
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6507 "Tree.c"
+#line 6518 "Tree.c"
 		GdkDragContext* _tmp5_ = NULL;
 		GtkWidget* _tmp6_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6516 "Tree.c"
+#line 6527 "Tree.c"
 			SidebarTreeExternalDropHandler _tmp7_ = NULL;
 			void* _tmp7__target = NULL;
 			GdkDragContext* _tmp8_ = NULL;
 			GtkSelectionData* _tmp9_ = NULL;
 			guint _tmp10_ = 0U;
 			guint _tmp11_ = 0U;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7__target = self->priv->drop_handler_target;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = context;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = selection_data;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = info;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = time;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6537 "Tree.c"
+#line 6548 "Tree.c"
 		} else {
 			GdkDragContext* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6547 "Tree.c"
+#line 6558 "Tree.c"
 		}
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6553 "Tree.c"
+#line 6564 "Tree.c"
 	}
-#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
-#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
-#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp15_;
-#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
-#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6567 "Tree.c"
+#line 6578 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
 		SidebarTreeEntryWrapper* _tmp19_ = NULL;
 		SidebarTreeExternalDropHandler _tmp22_ = NULL;
@@ -6572,128 +6583,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GtkSelectionData* _tmp24_ = NULL;
 		guint _tmp25_ = 0U;
 		guint _tmp26_ = 0U;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6580 "Tree.c"
+#line 6591 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6589 "Tree.c"
+#line 6600 "Tree.c"
 		} else {
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6593 "Tree.c"
+#line 6604 "Tree.c"
 		}
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22__target = self->priv->drop_handler_target;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = context;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = selection_data;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = info;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = time;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
-#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6615 "Tree.c"
+#line 6626 "Tree.c"
 	}
-#line 1081 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 1081 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6621 "Tree.c"
+#line 6632 "Tree.c"
 		GdkDragContext* _tmp28_ = NULL;
 		guint _tmp29_ = 0U;
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp29_ = time;
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
 #line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6636 "Tree.c"
+#line 6647 "Tree.c"
 	}
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = _tmp30_->entry;
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/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 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	targetable = _tmp32_;
-#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = targetable;
-#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6650 "Tree.c"
+#line 6661 "Tree.c"
 		GdkDragContext* _tmp34_ = NULL;
 		guint _tmp35_ = 0U;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = time;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
 #line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6667 "Tree.c"
+#line 6678 "Tree.c"
 	}
-#line 1094 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	success = FALSE;
 #line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	success = FALSE;
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = selection_data;
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = gdk_atom_name (_tmp37_);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = _tmp38_;
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp39_);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6685 "Tree.c"
+#line 6696 "Tree.c"
 		SidebarInternalDropTargetEntry* _tmp41_ = NULL;
 		GtkSelectionData* _tmp42_ = NULL;
 		gboolean _tmp43_ = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = selection_data;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6697 "Tree.c"
+#line 6708 "Tree.c"
 	} else {
 		GeeList* media = NULL;
 		GtkSelectionData* _tmp44_ = NULL;
@@ -6703,75 +6714,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GeeList* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 		GeeList* _tmp50_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp46_ = selection_data;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		media = _tmp48_;
 #line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		media = _tmp48_;
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = media;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6723 "Tree.c"
+#line 6734 "Tree.c"
 			GeeList* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
 			gint _tmp53_ = 0;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp53_ = _tmp52_;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6735 "Tree.c"
+#line 6746 "Tree.c"
 		} else {
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6739 "Tree.c"
+#line 6750 "Tree.c"
 		}
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6743 "Tree.c"
+#line 6754 "Tree.c"
 			SidebarInternalDropTargetEntry* _tmp54_ = NULL;
 			GeeList* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = media;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6755 "Tree.c"
+#line 6766 "Tree.c"
 		}
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6759 "Tree.c"
+#line 6770 "Tree.c"
 	}
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = success;
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = time;
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6775 "Tree.c"
+#line 6786 "Tree.c"
 }
 
 
@@ -6796,90 +6807,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	GdkDragContext* _tmp16_ = NULL;
 	GdkDragAction _tmp17_ = 0;
 	guint _tmp18_ = 0U;
-#line 1108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
 #line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = context;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = x;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = y;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = time;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/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 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = x;
-#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/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 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp6_;
-#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp7_;
-#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	has_dest = _tmp8_;
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = has_dest;
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp10_) {
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6834 "Tree.c"
+#line 6845 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp11_ = 0;
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6841 "Tree.c"
+#line 6852 "Tree.c"
 	}
-#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6845 "Tree.c"
+#line 6856 "Tree.c"
 		GtkTreePath* _tmp12_ = NULL;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 1118 "/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), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 6851 "Tree.c"
+#line 6862 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp13_ = 0;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6858 "Tree.c"
+#line 6869 "Tree.c"
 			GtkTreePath* _tmp14_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/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 6864 "Tree.c"
+#line 6875 "Tree.c"
 		}
 	}
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = time;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
 #line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6883 "Tree.c"
+#line 6894 "Tree.c"
 }
 
 
@@ -6899,91 +6910,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	SidebarEntry* _tmp9_ = NULL;
 	GtkTreeSelection* _tmp10_ = NULL;
 	GtkTreePath* _tmp11_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ > 0) {
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6915 "Tree.c"
+#line 6926 "Tree.c"
 	}
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp2_;
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6933 "Tree.c"
+#line 6944 "Tree.c"
 	}
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/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 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp6_;
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = renameable;
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ == NULL) {
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6955 "Tree.c"
+#line 6966 "Tree.c"
 	}
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_->entry;
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6971 "Tree.c"
+#line 6982 "Tree.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/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 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = path;
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
 #line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
+#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6987 "Tree.c"
+#line 6998 "Tree.c"
 }
 
 
@@ -6999,121 +7010,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	SidebarDestroyableEntry* _tmp5_ = NULL;
 	SidebarDestroyableEntry* _tmp6_ = NULL;
 	SidebarDestroyableEntry* _tmp7_ = NULL;
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7023 "Tree.c"
+#line 7034 "Tree.c"
 	}
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/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 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	destroyable = _tmp5_;
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = destroyable;
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (destroyable);
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7045 "Tree.c"
+#line 7056 "Tree.c"
 	}
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_destroyable_entry_destroy_source (_tmp7_);
 #line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	sidebar_destroyable_entry_destroy_source (_tmp7_);
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (destroyable);
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7059 "Tree.c"
+#line 7070 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7066 "Tree.c"
+#line 7077 "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 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7075 "Tree.c"
+#line 7086 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
 	GtkCellEditable* _tmp0_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_EDITABLE (editable));
-#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = editable;
-#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7091 "Tree.c"
+#line 7102 "Tree.c"
 		GtkCellEditable* _tmp1_ = NULL;
 		GtkEntry* _tmp2_ = NULL;
 		GtkEntry* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->text_entry = _tmp2_;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->text_entry;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/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 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->text_entry;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/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 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->text_entry;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7117 "Tree.c"
+#line 7128 "Tree.c"
 	}
 }
 
@@ -7124,25 +7135,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	guint _tmp2_ = 0U;
 	GtkEntry* _tmp3_ = NULL;
 	guint _tmp4_ = 0U;
-#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_set (_tmp0_, "editable", FALSE, NULL);
 #line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_set (_tmp0_, "editable", FALSE, NULL);
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE);
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/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 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
-#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1177 "/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 7146 "Tree.c"
+#line 7157 "Tree.c"
 }
 
 
@@ -7158,110 +7169,110 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	guint _tmp14_ = 0U;
 	GtkEntry* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_set (_tmp0_, "editable", FALSE, NULL);
 #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_set (_tmp0_, "editable", FALSE, NULL);
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_current_path (self);
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp2_);
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7184 "Tree.c"
+#line 7195 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarRenameableEntry* _tmp8_ = NULL;
 		SidebarRenameableEntry* _tmp9_ = NULL;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/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 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		renameable = _tmp8_;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = renameable;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7202 "Tree.c"
+#line 7213 "Tree.c"
 			SidebarRenameableEntry* _tmp10_ = NULL;
 			GtkEntry* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = self->priv->text_entry;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7214 "Tree.c"
+#line 7225 "Tree.c"
 		}
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7218 "Tree.c"
+#line 7229 "Tree.c"
 	}
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/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 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1191 "/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 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7234 "Tree.c"
+#line 7245 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 1192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7248 "Tree.c"
+#line 7259 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_;
-#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 7265 "Tree.c"
+#line 7276 "Tree.c"
 }
 
 
@@ -7274,37 +7285,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	LibraryWindow* _tmp4_ = NULL;
 	Tag* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = new_root_tag_command_new ();
-#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	creation_command = _tmp0_;
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = app_window_get_command_manager ();
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_command_manager_unref0 (_tmp2_);
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = library_window_get_app ();
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7308 "Tree.c"
+#line 7319 "Tree.c"
 }
 
 
@@ -7323,19 +7334,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 7327 "Tree.c"
+#line 7338 "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 7333 "Tree.c"
+#line 7344 "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 7339 "Tree.c"
+#line 7350 "Tree.c"
 }
 
 
@@ -7354,19 +7365,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 7358 "Tree.c"
+#line 7369 "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 7364 "Tree.c"
+#line 7375 "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 7370 "Tree.c"
+#line 7381 "Tree.c"
 }
 
 
@@ -7405,14 +7416,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 7409 "Tree.c"
+#line 7420 "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 7416 "Tree.c"
+#line 7427 "Tree.c"
 }
 
 
@@ -7430,7 +7441,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 7434 "Tree.c"
+#line 7445 "Tree.c"
 }
 
 
@@ -7470,7 +7481,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 7474 "Tree.c"
+#line 7485 "Tree.c"
 }
 
 
@@ -7479,7 +7490,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 7483 "Tree.c"
+#line 7494 "Tree.c"
 }
 
 
@@ -7497,7 +7508,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 7501 "Tree.c"
+#line 7512 "Tree.c"
 }
 
 
@@ -7539,14 +7550,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 7543 "Tree.c"
+#line 7554 "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 7550 "Tree.c"
+#line 7561 "Tree.c"
 }
 
 
@@ -7555,7 +7566,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 7559 "Tree.c"
+#line 7570 "Tree.c"
 }
 
 
@@ -7569,7 +7580,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 7573 "Tree.c"
+#line 7584 "Tree.c"
 }
 
 
@@ -7620,7 +7631,7 @@ 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 7624 "Tree.c"
+#line 7635 "Tree.c"
 }
 
 
@@ -7667,7 +7678,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 7671 "Tree.c"
+#line 7682 "Tree.c"
 }
 
 
@@ -7711,7 +7722,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 7715 "Tree.c"
+#line 7726 "Tree.c"
 }
 
 
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index 5ba28fa..9c80f00 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -845,7 +845,9 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (context_menu == null)
             return false;
 
-        context_menu.attach_to_widget (this, null);
+        if (context_menu.get_attach_widget() == null) {
+            context_menu.attach_to_widget (this, null);
+        }
 
         if (event != null)
             context_menu.popup(null, null, null, event.button, event.time);
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 1ef4450..582e3a9 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.32.1, the Vala compiler
+/* common.c generated by valac 0.34.4, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 1731cfa..33dd9b1 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.32.1, the Vala compiler
+/* Slideshow.c generated by valac 0.34.4, the Vala compiler
  * generated from Slideshow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c
index 292187e..f874db1 100644
--- a/src/slideshow/TransitionEffects.c
+++ b/src/slideshow/TransitionEffects.c
@@ -1,4 +1,4 @@
-/* TransitionEffects.c generated by valac 0.32.1, the Vala compiler
+/* TransitionEffects.c generated by valac 0.34.4, the Vala compiler
  * generated from TransitionEffects.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 30e05f0..2ed3ac9 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1668,7 +1668,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1671 "Branch.c"
-			goto __catch51_g_error;
+			goto __catch53_g_error;
 		}
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp2_ = self->priv->builder;
@@ -1692,8 +1692,8 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		_g_object_unref0 (model);
 #line 1694 "Branch.c"
 	}
-	goto __finally51;
-	__catch51_g_error:
+	goto __finally53;
+	__catch53_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp7_ = NULL;
@@ -1730,7 +1730,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		_g_error_free0 (_error_);
 #line 1732 "Branch.c"
 	}
-	__finally51:
+	__finally53:
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2212,11 +2212,11 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 2222 "Branch.c"
 	{
@@ -2231,98 +2231,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2253 "Branch.c"
-				goto __catch52_g_regex_error;
+				goto __catch54_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2262 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2278 "Branch.c"
-				goto __catch52_g_regex_error;
+				goto __catch54_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2289 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 2303 "Branch.c"
 	}
-	goto __finally52;
-	__catch52_g_regex_error:
+	goto __finally54;
+	__catch54_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 2317 "Branch.c"
 	}
-	__finally52:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally54:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 2328 "Branch.c"
 	}
@@ -2837,39 +2837,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
 #line 2869 "Branch.c"
 	}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2875 "Branch.c"
 }
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index dc5e970..0a163d3 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.34.4, the Vala compiler
  * generated from HierarchicalTagIndex.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 05d9126..0977264 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.34.4, the Vala compiler
  * generated from HierarchicalTagUtilities.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,37 +263,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 279 "HierarchicalTagUtilities.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 287 "HierarchicalTagUtilities.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 299 "HierarchicalTagUtilities.c"
 	}
@@ -313,112 +313,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 323 "HierarchicalTagUtilities.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 329 "HierarchicalTagUtilities.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 333 "HierarchicalTagUtilities.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 337 "HierarchicalTagUtilities.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 349 "HierarchicalTagUtilities.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 359 "HierarchicalTagUtilities.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 365 "HierarchicalTagUtilities.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 379 "HierarchicalTagUtilities.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 389 "HierarchicalTagUtilities.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 395 "HierarchicalTagUtilities.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 404 "HierarchicalTagUtilities.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 424 "HierarchicalTagUtilities.c"
 }
@@ -756,72 +756,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
 #line 766 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 776 "HierarchicalTagUtilities.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 786 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 792 "HierarchicalTagUtilities.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 803 "HierarchicalTagUtilities.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 815 "HierarchicalTagUtilities.c"
 		} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 819 "HierarchicalTagUtilities.c"
 		}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 823 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 827 "HierarchicalTagUtilities.c"
 		gint i = 0;
@@ -844,16 +844,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 850 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 859 "HierarchicalTagUtilities.c"
 				gboolean _tmp11_ = FALSE;
@@ -866,97 +866,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 872 "HierarchicalTagUtilities.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 878 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 888 "HierarchicalTagUtilities.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 900 "HierarchicalTagUtilities.c"
 				} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 904 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 910 "HierarchicalTagUtilities.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 921 "HierarchicalTagUtilities.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 936 "HierarchicalTagUtilities.c"
 					} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 940 "HierarchicalTagUtilities.c"
 					}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 944 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 950 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 962 "HierarchicalTagUtilities.c"
 					gchar** _tmp25_ = NULL;
@@ -965,91 +965,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 983 "HierarchicalTagUtilities.c"
 				} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 987 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 993 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 1000 "HierarchicalTagUtilities.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
 #line 1008 "HierarchicalTagUtilities.c"
 		}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 1046 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 1055 "HierarchicalTagUtilities.c"
 				gint _tmp48_ = 0;
@@ -1065,94 +1065,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 1071 "HierarchicalTagUtilities.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 1077 "HierarchicalTagUtilities.c"
 				}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
 #line 1091 "HierarchicalTagUtilities.c"
 				}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 1111 "HierarchicalTagUtilities.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 1126 "HierarchicalTagUtilities.c"
 				} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 1130 "HierarchicalTagUtilities.c"
 				}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 1138 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1149 "HierarchicalTagUtilities.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1158 "HierarchicalTagUtilities.c"
 	}
@@ -1273,11 +1273,11 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1283 "HierarchicalTagUtilities.c"
 	{
@@ -1292,98 +1292,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1314 "HierarchicalTagUtilities.c"
-				goto __catch53_g_regex_error;
+				goto __catch55_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1323 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1339 "HierarchicalTagUtilities.c"
-				goto __catch53_g_regex_error;
+				goto __catch55_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1350 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 1364 "HierarchicalTagUtilities.c"
 	}
-	goto __finally53;
-	__catch53_g_regex_error:
+	goto __finally55;
+	__catch55_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1378 "HierarchicalTagUtilities.c"
 	}
-	__finally53:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+	__finally55:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1389 "HierarchicalTagUtilities.c"
 	}
@@ -1394,15 +1394,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 1408 "HierarchicalTagUtilities.c"
 }
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 8a95878..9c8acc0 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.32.1, the Vala compiler
+/* TagPage.c generated by valac 0.34.4, the Vala compiler
  * generated from TagPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <gio/gio.h>
 
 
 #define TYPE_PAGE (page_get_type ())
@@ -304,16 +304,6 @@ 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))
@@ -365,6 +355,16 @@ 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))
@@ -435,7 +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 (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -681,10 +682,10 @@ 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 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);
+static void tag_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void tag_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
 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);
@@ -713,6 +714,7 @@ 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);
@@ -735,42 +737,42 @@ static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_dele
 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 739 "TagPage.c"
+#line 741 "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"
+#line 748 "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"
+#line 755 "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"
+#line 762 "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"
+#line 769 "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 774 "TagPage.c"
+#line 776 "TagPage.c"
 }
 
 
@@ -779,7 +781,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 783 "TagPage.c"
+#line 785 "TagPage.c"
 }
 
 
@@ -832,14 +834,14 @@ TagPage* tag_page_construct (GType object_type, Tag* tag) {
 	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 836 "TagPage.c"
+#line 838 "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 843 "TagPage.c"
+#line 845 "TagPage.c"
 }
 
 
@@ -859,7 +861,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 863 "TagPage.c"
+#line 865 "TagPage.c"
 }
 
 
@@ -877,7 +879,7 @@ Tag* tag_page_get_tag (TagPage* self) {
 	result = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return result;
-#line 881 "TagPage.c"
+#line 883 "TagPage.c"
 }
 
 
@@ -907,13 +909,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 911 "TagPage.c"
+#line 913 "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 917 "TagPage.c"
+#line 919 "TagPage.c"
 	}
 }
 
@@ -938,27 +940,74 @@ 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 942 "TagPage.c"
+#line 944 "TagPage.c"
 }
 
 
-static void tag_page_real_add_actions (Page* base) {
+static void tag_page_real_add_actions (Page* base, GActionMap* map) {
 	TagPage * self;
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
 #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
 #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_;
+	_tmp0_ = map;
+#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), _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);
+	_tmp1_ = map;
 #line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 962 "TagPage.c"
+	g_action_map_add_action_entries (_tmp1_, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self);
+#line 964 "TagPage.c"
+}
+
+
+static void tag_page_real_remove_actions (Page* base, GActionMap* map) {
+	TagPage * self;
+	GActionMap* _tmp0_ = NULL;
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp0_ = map;
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+#line 979 "TagPage.c"
+	{
+		GActionEntry* entry_collection = NULL;
+		gint entry_collection_length1 = 0;
+		gint _entry_collection_size_ = 0;
+		gint entry_it = 0;
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+		entry_collection = TAG_PAGE_entries;
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+		entry_collection_length1 = G_N_ELEMENTS (TAG_PAGE_entries);
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+		for (entry_it = 0; entry_it < G_N_ELEMENTS (TAG_PAGE_entries); entry_it = entry_it + 1) {
+#line 991 "TagPage.c"
+			GActionEntry entry = {0};
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+			entry = entry_collection[entry_it];
+#line 995 "TagPage.c"
+			{
+				GActionMap* _tmp1_ = NULL;
+				GActionEntry _tmp2_ = {0};
+				const gchar* _tmp3_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+				_tmp1_ = map;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+				_tmp2_ = entry;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+				_tmp3_ = _tmp2_.name;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+				g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1008 "TagPage.c"
+			}
+		}
+	}
 }
 
 
@@ -966,19 +1015,19 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 	GeeMap* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = map;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = self->priv->tag;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/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 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp2_) {
-#line 982 "TagPage.c"
+#line 1031 "TagPage.c"
 		Tag* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -988,35 +1037,35 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp3_ = self->priv->tag;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = _tmp4_;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_free0 (_tmp5_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp7_ = _tmp6_;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp10_ = _tmp9_;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 1020 "TagPage.c"
+#line 1069 "TagPage.c"
 	}
 }
 
@@ -1038,59 +1087,59 @@ static void tag_page_real_switched_to (Page* base) {
 	gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 70 "/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"
+#line 71 "/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"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/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"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = resources_delete_tag_menu (_tmp2_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp4_ = _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/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"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp4_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp2_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp5_ = self->priv->tag;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/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"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp7_ = _tmp6_;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp8_ = resources_rename_tag_menu (_tmp7_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp9_ = _tmp8_;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/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"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp9_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp7_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp10_ = self->priv->tag;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/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"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp12_ = _tmp11_;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/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"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp14_ = _tmp13_;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/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"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp14_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp12_);
-#line 1094 "TagPage.c"
+#line 1143 "TagPage.c"
 }
 
 
@@ -1115,67 +1164,67 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
 	gint _tmp18_ = 0;
-#line 73 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = _tmp1_;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = resources_delete_tag_menu (_tmp2_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp4_ = _tmp3_;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/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 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp4_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp2_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp5_ = self->priv->tag;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp6_ = tag_get_user_visible_name (_tmp5_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp7_ = _tmp6_;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp8_ = resources_rename_tag_menu (_tmp7_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp9_ = _tmp8_;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/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 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp9_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp7_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp10_ = self->priv->tag;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp11_ = tag_get_user_visible_name (_tmp10_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp12_ = _tmp11_;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp13_ = selected_count;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp15_ = _tmp14_;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp16_ = selected_count;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/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 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp15_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp12_);
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp17_ = selected_count;
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp18_ = count;
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/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 1179 "TagPage.c"
+#line 1228 "TagPage.c"
 }
 
 
@@ -1189,39 +1238,39 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) {
 	LibraryWindow* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
 	Tag* _tmp7_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = new_child_tag_command_new (_tmp0_);
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	creation_command = _tmp1_;
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = _tmp2_;
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp4_ = library_window_get_app ();
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp5_ = _tmp4_;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp6_ = new_child_tag_command_get_created_child (creation_command);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp7_ = _tmp6_;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	library_window_rename_tag_in_sidebar (_tmp5_, _tmp7_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (creation_command);
-#line 1225 "TagPage.c"
+#line 1274 "TagPage.c"
 }
 
 
@@ -1229,56 +1278,56 @@ static void tag_page_on_rename_tag (TagPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	Tag* _tmp2_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 107 "/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 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = self->priv->tag;
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_);
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1245 "TagPage.c"
+#line 1294 "TagPage.c"
 }
 
 
 static void tag_page_on_delete_tag (TagPage* self) {
 	Tag* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp1_) {
-#line 1260 "TagPage.c"
+#line 1309 "TagPage.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		Tag* _tmp4_ = NULL;
 		DeleteTagCommand* _tmp5_ = NULL;
 		DeleteTagCommand* _tmp6_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp3_ = _tmp2_;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = self->priv->tag;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = _tmp5_;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1282 "TagPage.c"
+#line 1331 "TagPage.c"
 	}
 }
 
@@ -1288,21 +1337,21 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp3_) {
-#line 1306 "TagPage.c"
+#line 1355 "TagPage.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		Tag* _tmp6_ = NULL;
@@ -1315,43 +1364,43 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
 		gint _tmp13_ = 0;
 		TagUntagPhotosCommand* _tmp14_ = NULL;
 		TagUntagPhotosCommand* _tmp15_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = self->priv->tag;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp8_ = _tmp7_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp12_ = _tmp11_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp13_ = view_collection_get_selected_count (_tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp15_ = _tmp14_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 1355 "TagPage.c"
+#line 1404 "TagPage.c"
 	}
 }
 
@@ -1370,19 +1419,21 @@ static void tag_page_class_init (TagPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	((PageClass *) klass)->add_actions = tag_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	((PageClass *) klass)->remove_actions = tag_page_real_remove_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 1379 "TagPage.c"
+#line 1430 "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 1386 "TagPage.c"
+#line 1437 "TagPage.c"
 }
 
 
@@ -1412,7 +1463,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 1416 "TagPage.c"
+#line 1467 "TagPage.c"
 }
 
 
diff --git a/src/tags/TagPage.vala b/src/tags/TagPage.vala
index 04696c5..431eaf4 100644
--- a/src/tags/TagPage.vala
+++ b/src/tags/TagPage.vala
@@ -47,10 +47,17 @@ public class TagPage : CollectionPage {
         { "NewChildTagSidebar", on_new_child_tag_sidebar }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions(GLib.ActionMap map) {
+        base.add_actions(map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries(entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     private void on_tags_altered(Gee.Map<DataObject, Alteration> map) {
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 0f14960..3cc2f18 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.32.1, the Vala compiler
+/* Tags.c generated by valac 0.34.4, the Vala compiler
  * generated from Tags.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index 006e1b0..ec7c78f 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.32.1, the Vala compiler
+/* BackgroundJob.c generated by valac 0.34.4, the Vala compiler
  * generated from BackgroundJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1155,7 +1155,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 			_background_job_notification_job_unref0 (_tmp5_);
 #line 1157 "BackgroundJob.c"
 		}
-		__finally11:
+		__finally13:
 		{
 			GeeArrayList* _tmp6_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1258,7 +1258,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 1259 "BackgroundJob.c"
 			}
 		}
-		__finally12:
+		__finally14:
 		{
 			GeeArrayList* _tmp6_ = NULL;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 9874b65..34c55e4 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.32.1, the Vala compiler
+/* Semaphore.c generated by valac 0.34.4, the Vala compiler
  * generated from Semaphore.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index d87457f..e50f83e 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.32.1, the Vala compiler
+/* Threads.c generated by valac 0.34.4, the Vala compiler
  * generated from Threads.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Workers.c b/src/threads/Workers.c
index 92d5e97..312f3e3 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.32.1, the Vala compiler
+/* Workers.c generated by valac 0.34.4, the Vala compiler
  * generated from Workers.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -312,7 +312,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			if (_inner_error_->domain == G_THREAD_ERROR) {
 #line 315 "Workers.c"
-				goto __catch6_g_thread_error;
+				goto __catch8_g_thread_error;
 			}
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.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);
@@ -334,8 +334,8 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 		_g_thread_pool_free0 (_tmp4_);
 #line 336 "Workers.c"
 	}
-	goto __finally6;
-	__catch6_g_thread_error:
+	goto __finally8;
+	__catch8_g_thread_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -351,7 +351,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 		_g_error_free0 (err);
 #line 353 "Workers.c"
 	}
-	__finally6:
+	__finally8:
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -508,7 +508,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 			self->priv->enqueued = _tmp5_ + 1;
 #line 510 "Workers.c"
 		}
-		__finally7:
+		__finally9:
 		{
 			GAsyncQueue* _tmp6_ = NULL;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -542,7 +542,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			if (_inner_error_->domain == G_THREAD_ERROR) {
 #line 545 "Workers.c"
-				goto __catch8_g_thread_error;
+				goto __catch10_g_thread_error;
 			}
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.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);
@@ -553,8 +553,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 #line 554 "Workers.c"
 		}
 	}
-	goto __finally8;
-	__catch8_g_thread_error:
+	goto __finally10;
+	__catch10_g_thread_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -573,7 +573,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 		_g_error_free0 (err);
 #line 575 "Workers.c"
 	}
-	__finally8:
+	__finally10:
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -687,7 +687,7 @@ gint workers_get_pending_job_count (Workers* self) {
 			return result;
 #line 689 "Workers.c"
 		}
-		__finally9:
+		__finally11:
 		{
 			GAsyncQueue* _tmp3_ = NULL;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -752,7 +752,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 			empty = _tmp5_ == 0;
 #line 754 "Workers.c"
 		}
-		__finally10:
+		__finally12:
 		{
 			GAsyncQueue* _tmp6_ = NULL;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
diff --git a/src/unit/Unit.c b/src/unit/Unit.c
index d652834..41a26e9 100644
--- a/src/unit/Unit.c
+++ b/src/unit/Unit.c
@@ -1,4 +1,4 @@
-/* Unit.c generated by valac 0.32.1, the Vala compiler
+/* Unit.c generated by valac 0.34.4, the Vala compiler
  * generated from Unit.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 003f0ca..40ffa4d 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.32.1, the Vala compiler
+/* KeyValueMap.c generated by valac 0.34.4, the Vala compiler
  * generated from KeyValueMap.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -355,23 +355,23 @@ static gchar* double_to_string (gdouble self) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 377 "KeyValueMap.c"
 }
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (self) {
 #line 451 "KeyValueMap.c"
 		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 459 "KeyValueMap.c"
 	} else {
 		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 468 "KeyValueMap.c"
 	}
@@ -610,15 +610,15 @@ static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
 	const gchar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 624 "KeyValueMap.c"
 }
@@ -731,21 +731,21 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 static gboolean bool_parse (const gchar* str) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 745 "KeyValueMap.c"
 	} else {
-#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 751 "KeyValueMap.c"
 	}
diff --git a/src/util/Util.c b/src/util/Util.c
index ec9f4ff..b7aff8f 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.32.1, the Vala compiler
+/* Util.c generated by valac 0.34.4, the Vala compiler
  * generated from Util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index b219fd2..211fbe3 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.32.1, the Vala compiler
+/* file.c generated by valac 0.34.4, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -411,37 +411,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 427 "file.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 435 "file.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
 #line 447 "file.c"
 	}
@@ -461,112 +461,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 471 "file.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 477 "file.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 481 "file.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 485 "file.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 497 "file.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 507 "file.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 513 "file.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 527 "file.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 537 "file.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 543 "file.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 552 "file.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 572 "file.c"
 }
diff --git a/src/util/image.c b/src/util/image.c
index a68553e..f6c82ec 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.32.1, the Vala compiler
+/* image.c generated by valac 0.34.4, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/misc.c b/src/util/misc.c
index 848194e..65c37e5 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.32.1, the Vala compiler
+/* misc.c generated by valac 0.34.4, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -684,7 +684,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6__length1 = buffer_length1;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
-			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			bytes_read = (gsize) _tmp7_;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -727,7 +727,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 734 "misc.c"
@@ -1968,35 +1968,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2002 "misc.c"
 }
diff --git a/src/util/string.c b/src/util/string.c
index 4cfeedd..931e58d 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.32.1, the Vala compiler
+/* string.c generated by valac 0.34.4, the Vala compiler
  * generated from string.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -16,6 +16,7 @@
 #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 
 #define TYPE_PREPARE_INPUT_TEXT_OPTIONS (prepare_input_text_options_get_type ())
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 typedef enum  {
 	PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL = 1 << 0,
@@ -41,6 +42,7 @@ gchar* guarded_markup_escape_text (const gchar* plain);
 glong find_last_offset (const gchar* str, gchar c);
 gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1);
 GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
+gchar* guess_convert (const gchar* text);
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
 gint64 parse_int64 (const gchar* str, gint num_base);
 gboolean string_contains_char (const gchar* haystack, gunichar needle);
@@ -65,17 +67,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 79 "string.c"
+#line 81 "string.c"
 }
 
 
@@ -89,7 +91,7 @@ inline gboolean is_string_empty (const gchar* s) {
 	if (_tmp1_ == NULL) {
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = TRUE;
-#line 93 "string.c"
+#line 95 "string.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gchar _tmp3_ = '\0';
@@ -99,13 +101,13 @@ inline gboolean is_string_empty (const gchar* s) {
 		_tmp3_ = string_get (_tmp2_, (glong) 0);
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = _tmp3_ == '\0';
-#line 103 "string.c"
+#line 105 "string.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 109 "string.c"
+#line 111 "string.c"
 }
 
 
@@ -124,7 +126,7 @@ gint utf8_cs_compare (void* a, void* b) {
 	result = _tmp2_;
 #line 17 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 128 "string.c"
+#line 130 "string.c"
 }
 
 
@@ -162,7 +164,7 @@ gint utf8_ci_compare (void* a, void* b) {
 	result = _tmp7_;
 #line 22 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 166 "string.c"
+#line 168 "string.c"
 }
 
 
@@ -178,7 +180,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 	_tmp0_ = length;
 #line 27 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp0_ < 0) {
-#line 182 "string.c"
+#line 184 "string.c"
 		guchar* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 #line 28 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -187,25 +189,25 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 		_tmp1__length1 = data_length1;
 #line 28 "/home/jens/Source/shotwell/src/util/string.vala"
 		length = _tmp1__length1;
-#line 191 "string.c"
+#line 193 "string.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = g_string_new ("");
 #line 30 "/home/jens/Source/shotwell/src/util/string.vala"
 	builder = _tmp2_;
-#line 197 "string.c"
+#line 199 "string.c"
 	{
 		gint ctr = 0;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 		ctr = 0;
-#line 202 "string.c"
+#line 204 "string.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp3_ = TRUE;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
-#line 209 "string.c"
+#line 211 "string.c"
 				gint _tmp5_ = 0;
 				gint _tmp6_ = 0;
 				guchar* _tmp7_ = NULL;
@@ -214,13 +216,13 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 				guchar _tmp9_ = '\0';
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp3_) {
-#line 218 "string.c"
+#line 220 "string.c"
 					gint _tmp4_ = 0;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp4_ = ctr;
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 					ctr = _tmp4_ + 1;
-#line 224 "string.c"
+#line 226 "string.c"
 				}
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp3_ = FALSE;
@@ -232,7 +234,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 				if (!(_tmp5_ < _tmp6_)) {
 #line 31 "/home/jens/Source/shotwell/src/util/string.vala"
 					break;
-#line 236 "string.c"
+#line 238 "string.c"
 				}
 #line 32 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp7_ = data;
@@ -244,7 +246,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 				_tmp9_ = _tmp7_[_tmp8_];
 #line 32 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (_tmp9_ != ((guchar) '\0')) {
-#line 248 "string.c"
+#line 250 "string.c"
 					GString* _tmp10_ = NULL;
 					guchar* _tmp11_ = NULL;
 					gint _tmp11__length1 = 0;
@@ -262,11 +264,11 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 					_tmp13_ = _tmp11_[_tmp12_];
 #line 33 "/home/jens/Source/shotwell/src/util/string.vala"
 					g_string_append_c (_tmp10_, (gchar) _tmp13_);
-#line 266 "string.c"
+#line 268 "string.c"
 				} else {
 #line 35 "/home/jens/Source/shotwell/src/util/string.vala"
 					break;
-#line 270 "string.c"
+#line 272 "string.c"
 				}
 			}
 		}
@@ -283,7 +285,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
 	_g_string_free0 (builder);
 #line 38 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 287 "string.c"
+#line 289 "string.c"
 }
 
 
@@ -294,11 +296,11 @@ static void _vala_array_add1 (guchar** array, int* length, int* size, guchar val
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
 		*array = g_renew (guchar, *array, *size);
-#line 298 "string.c"
+#line 300 "string.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
 	(*array)[(*length)++] = value;
-#line 302 "string.c"
+#line 304 "string.c"
 }
 
 
@@ -320,19 +322,19 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 	data_length1 = 0;
 #line 43 "/home/jens/Source/shotwell/src/util/string.vala"
 	_data_size_ = data_length1;
-#line 324 "string.c"
+#line 326 "string.c"
 	{
 		gint ctr = 0;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 		ctr = 0;
-#line 329 "string.c"
+#line 331 "string.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp1_ = TRUE;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
-#line 336 "string.c"
+#line 338 "string.c"
 				gint _tmp3_ = 0;
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
@@ -344,13 +346,13 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 				gchar _tmp10_ = '\0';
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp1_) {
-#line 348 "string.c"
+#line 350 "string.c"
 					gint _tmp2_ = 0;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp2_ = ctr;
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 					ctr = _tmp2_ + 1;
-#line 354 "string.c"
+#line 356 "string.c"
 				}
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp1_ = FALSE;
@@ -366,7 +368,7 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 				if (!(_tmp3_ < _tmp6_)) {
 #line 44 "/home/jens/Source/shotwell/src/util/string.vala"
 					break;
-#line 370 "string.c"
+#line 372 "string.c"
 				}
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp7_ = data;
@@ -380,7 +382,7 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 				_tmp10_ = string_get (_tmp8_, (glong) _tmp9_);
 #line 45 "/home/jens/Source/shotwell/src/util/string.vala"
 				_vala_array_add1 (&data, &data_length1, &_data_size_, (guchar) _tmp10_);
-#line 384 "string.c"
+#line 386 "string.c"
 			}
 		}
 	}
@@ -392,13 +394,13 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
 	if (result_length1) {
 #line 47 "/home/jens/Source/shotwell/src/util/string.vala"
 		*result_length1 = _tmp11__length1;
-#line 396 "string.c"
+#line 398 "string.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp11_;
 #line 47 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 402 "string.c"
+#line 404 "string.c"
 }
 
 
@@ -414,7 +416,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 	_tmp3_ = is_string_empty (_tmp2_);
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (!_tmp3_) {
-#line 418 "string.c"
+#line 420 "string.c"
 		const gchar* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -423,15 +425,15 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 		_tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL);
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = _tmp5_;
-#line 427 "string.c"
+#line 429 "string.c"
 	} else {
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = FALSE;
-#line 431 "string.c"
+#line 433 "string.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp1_) {
-#line 435 "string.c"
+#line 437 "string.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -442,7 +444,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 		_g_free0 (_tmp0_);
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = _tmp7_;
-#line 446 "string.c"
+#line 448 "string.c"
 	} else {
 		gchar* _tmp8_ = NULL;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -451,13 +453,13 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
 		_g_free0 (_tmp0_);
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = _tmp8_;
-#line 455 "string.c"
+#line 457 "string.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 461 "string.c"
+#line 463 "string.c"
 }
 
 
@@ -479,7 +481,7 @@ glong find_last_offset (const gchar* str, gchar c) {
 	offset = (glong) _tmp2_;
 #line 63 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
-#line 483 "string.c"
+#line 485 "string.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		const gchar* _tmp5_ = NULL;
@@ -496,7 +498,7 @@ glong find_last_offset (const gchar* str, gchar c) {
 		if (!(_tmp4_ >= ((glong) 0))) {
 #line 63 "/home/jens/Source/shotwell/src/util/string.vala"
 			break;
-#line 500 "string.c"
+#line 502 "string.c"
 		}
 #line 64 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp5_ = str;
@@ -512,14 +514,14 @@ glong find_last_offset (const gchar* str, gchar c) {
 			result = offset;
 #line 65 "/home/jens/Source/shotwell/src/util/string.vala"
 			return result;
-#line 516 "string.c"
+#line 518 "string.c"
 		}
 	}
 #line 68 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = (glong) -1;
 #line 68 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 523 "string.c"
+#line 525 "string.c"
 }
 
 
@@ -542,7 +544,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 	_tmp2_ = strings;
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2__length1 = strings_length1;
-#line 546 "string.c"
+#line 548 "string.c"
 	{
 		gchar** str_element_collection = NULL;
 		gint str_element_collection_length1 = 0;
@@ -554,14 +556,14 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 		str_element_collection_length1 = _tmp2__length1;
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 		for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) {
-#line 558 "string.c"
+#line 560 "string.c"
 			gchar* _tmp3_ = NULL;
 			gchar* str_element = NULL;
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp3_ = g_strdup (str_element_collection[str_element_it]);
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 			str_element = _tmp3_;
-#line 565 "string.c"
+#line 567 "string.c"
 			{
 				const gchar* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -579,11 +581,11 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 					_g_free0 (strdown);
 #line 77 "/home/jens/Source/shotwell/src/util/string.vala"
 					return result;
-#line 583 "string.c"
+#line 585 "string.c"
 				}
 #line 75 "/home/jens/Source/shotwell/src/util/string.vala"
 				_g_free0 (str_element);
-#line 587 "string.c"
+#line 589 "string.c"
 			}
 		}
 	}
@@ -593,7 +595,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
 	_g_free0 (strdown);
 #line 80 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 597 "string.c"
+#line 599 "string.c"
 }
 
 
@@ -609,26 +611,294 @@ GType prepare_input_text_options_get_type (void) {
 }
 
 
+gchar* guess_convert (const gchar* text) {
+	gchar* result = NULL;
+	gchar* output = NULL;
+	gsize bytes_read = 0UL;
+	const gchar* charset = NULL;
+	const gchar* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	gsize _tmp30_ = 0UL;
+	const gchar* _tmp31_ = NULL;
+	gint _tmp32_ = 0;
+	gint _tmp33_ = 0;
+	GError * _inner_error_ = NULL;
+#line 94 "/home/jens/Source/shotwell/src/util/string.vala"
+	g_return_val_if_fail (text != NULL, NULL);
+#line 95 "/home/jens/Source/shotwell/src/util/string.vala"
+	output = NULL;
+#line 96 "/home/jens/Source/shotwell/src/util/string.vala"
+	bytes_read = (gsize) 0;
+#line 97 "/home/jens/Source/shotwell/src/util/string.vala"
+	charset = NULL;
+#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
+	g_debug ("string.vala:98: CONVERT: Text did not validate as UTF-8, trying conver" \
+"sion");
+#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp1_ = g_get_charset (&_tmp0_);
+#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
+	charset = _tmp0_;
+#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
+	if (!_tmp1_) {
+#line 643 "string.c"
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
+		gsize _tmp6_ = 0UL;
+		gchar* _tmp7_ = NULL;
+		gsize _tmp8_ = 0UL;
+		const gchar* _tmp9_ = NULL;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp2_ = text;
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp3_ = text;
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp4_ = strlen (_tmp3_);
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp5_ = _tmp4_;
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp7_ = g_locale_to_utf8 (_tmp2_, (gssize) _tmp5_, &_tmp6_, NULL, NULL);
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		bytes_read = _tmp6_;
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		_g_free0 (output);
+#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
+		output = _tmp7_;
+#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp8_ = bytes_read;
+#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp9_ = text;
+#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp10_ = strlen (_tmp9_);
+#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp11_ = _tmp10_;
+#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
+		if (_tmp8_ == ((gsize) _tmp11_)) {
+#line 680 "string.c"
+			const gchar* _tmp12_ = NULL;
+#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
+			_tmp12_ = charset;
+#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
+			g_debug ("string.vala:104: CONVERT: Locale is not UTF-8, convert from %s", _tmp12_);
+#line 105 "/home/jens/Source/shotwell/src/util/string.vala"
+			result = output;
+#line 105 "/home/jens/Source/shotwell/src/util/string.vala"
+			return result;
+#line 690 "string.c"
+		}
+	}
+	{
+		gchar* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+		gint _tmp16_ = 0;
+		gint _tmp17_ = 0;
+		gsize _tmp18_ = 0UL;
+		gchar* _tmp19_ = NULL;
+		gchar* _tmp20_ = NULL;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp14_ = text;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp15_ = text;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp16_ = strlen (_tmp15_);
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp17_ = _tmp16_;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp19_ = g_convert (_tmp14_, (gssize) _tmp17_, "UTF-8", "WINDOWS-1252", &_tmp18_, NULL, &_inner_error_);
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		bytes_read = _tmp18_;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp13_ = _tmp19_;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+			if (_inner_error_->domain == G_CONVERT_ERROR) {
+#line 720 "string.c"
+				goto __catch6_g_convert_error;
+			}
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+			_g_free0 (output);
+#line 110 "/home/jens/Source/shotwell/src/util/string.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 110 "/home/jens/Source/shotwell/src/util/string.vala"
+			g_clear_error (&_inner_error_);
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+			return NULL;
+#line 731 "string.c"
+		}
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp20_ = _tmp13_;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp13_ = NULL;
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		_g_free0 (output);
+#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
+		output = _tmp20_;
+#line 111 "/home/jens/Source/shotwell/src/util/string.vala"
+		charset = "WINDOWS-1252";
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		_g_free0 (_tmp13_);
+#line 745 "string.c"
+	}
+	goto __finally6;
+	__catch6_g_convert_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp21_ = NULL;
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		_error_ = _inner_error_;
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		_inner_error_ = NULL;
+#line 113 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp21_ = _error_;
+#line 113 "/home/jens/Source/shotwell/src/util/string.vala"
+		if (g_error_matches (_tmp21_, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION)) {
+#line 760 "string.c"
+			{
+				gchar* _tmp22_ = NULL;
+				const gchar* _tmp23_ = NULL;
+				const gchar* _tmp24_ = NULL;
+				gint _tmp25_ = 0;
+				gint _tmp26_ = 0;
+				gsize _tmp27_ = 0UL;
+				gchar* _tmp28_ = NULL;
+				gchar* _tmp29_ = NULL;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp23_ = text;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp24_ = text;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp25_ = strlen (_tmp24_);
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp26_ = _tmp25_;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp28_ = g_convert (_tmp23_, (gssize) _tmp26_, "UTF-8", "ISO-8859-1", &_tmp27_, NULL, &_inner_error_);
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				bytes_read = _tmp27_;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp22_ = _tmp28_;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 786 "string.c"
+					goto __catch7_g_error;
+				}
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp29_ = _tmp22_;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp22_ = NULL;
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_free0 (output);
+#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
+				output = _tmp29_;
+#line 116 "/home/jens/Source/shotwell/src/util/string.vala"
+				charset = "ISO-8859-1";
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_free0 (_tmp22_);
+#line 801 "string.c"
+			}
+			goto __finally7;
+			__catch7_g_error:
+			{
+				GError* _error_ = NULL;
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_error_ = _inner_error_;
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_inner_error_ = NULL;
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_error_free0 (_error_);
+#line 813 "string.c"
+			}
+			__finally7:
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_error_free0 (_error_);
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_error_free0 (_error_);
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_free0 (output);
+#line 114 "/home/jens/Source/shotwell/src/util/string.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 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				g_clear_error (&_inner_error_);
+#line 114 "/home/jens/Source/shotwell/src/util/string.vala"
+				return NULL;
+#line 830 "string.c"
+			}
+		}
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		_g_error_free0 (_error_);
+#line 835 "string.c"
+	}
+	__finally6:
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		_g_free0 (output);
+#line 109 "/home/jens/Source/shotwell/src/util/string.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 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		g_clear_error (&_inner_error_);
+#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
+		return NULL;
+#line 848 "string.c"
+	}
+#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp30_ = bytes_read;
+#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp31_ = text;
+#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp32_ = strlen (_tmp31_);
+#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp33_ = _tmp32_;
+#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
+	if (_tmp30_ == ((gsize) _tmp33_)) {
+#line 860 "string.c"
+		const gchar* _tmp34_ = NULL;
+#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp34_ = charset;
+#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
+		g_debug ("string.vala:122: CONVERT: Guessed conversion from %s", _tmp34_);
+#line 124 "/home/jens/Source/shotwell/src/util/string.vala"
+		result = output;
+#line 124 "/home/jens/Source/shotwell/src/util/string.vala"
+		return result;
+#line 870 "string.c"
+	}
+#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+	result = NULL;
+#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+	_g_free0 (output);
+#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+	return result;
+#line 878 "string.c"
+}
+
+
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 632 "string.c"
+#line 901 "string.c"
 }
 
 
@@ -639,231 +909,242 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 663 "string.c"
+#line 932 "string.c"
 }
 
 
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PrepareInputTextOptions _tmp2_ = 0;
 	gchar* prepped = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PrepareInputTextOptions _tmp10_ = 0;
-	PrepareInputTextOptions _tmp13_ = 0;
-	PrepareInputTextOptions _tmp16_ = 0;
-	gboolean _tmp19_ = FALSE;
-	PrepareInputTextOptions _tmp20_ = 0;
-	gint _tmp23_ = 0;
-#line 95 "/home/jens/Source/shotwell/src/util/string.vala"
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	PrepareInputTextOptions _tmp3_ = 0;
+	PrepareInputTextOptions _tmp12_ = 0;
+	PrepareInputTextOptions _tmp15_ = 0;
+	PrepareInputTextOptions _tmp18_ = 0;
+	gboolean _tmp21_ = FALSE;
+	PrepareInputTextOptions _tmp22_ = 0;
+	gint _tmp25_ = 0;
+#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = text;
-#line 95 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp0_ == NULL) {
-#line 96 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 132 "/home/jens/Source/shotwell/src/util/string.vala"
 		result = NULL;
-#line 96 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 132 "/home/jens/Source/shotwell/src/util/string.vala"
 		return result;
-#line 689 "string.c"
+#line 957 "string.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp2_ = options;
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-	if ((_tmp2_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) != 0) {
-#line 695 "string.c"
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp3_ = text;
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp4_ = g_utf8_validate (_tmp3_, (gssize) -1, NULL);
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp1_ = !_tmp4_;
-#line 704 "string.c"
-	} else {
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp1_ = FALSE;
-#line 708 "string.c"
-	}
-#line 98 "/home/jens/Source/shotwell/src/util/string.vala"
-	if (_tmp1_) {
-#line 712 "string.c"
-		const gchar* _tmp5_ = NULL;
-		PrepareInputTextOptions _tmp6_ = 0;
-		gchar* _tmp7_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp6_ = options;
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-		if ((_tmp6_ & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) {
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-			_tmp5_ = NULL;
-#line 722 "string.c"
-		} else {
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-			_tmp5_ = "";
-#line 726 "string.c"
+#line 134 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp1_ = text;
+#line 134 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 134 "/home/jens/Source/shotwell/src/util/string.vala"
+	prepped = _tmp2_;
+#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp3_ = options;
+#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+	if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) {
+#line 969 "string.c"
+		const gchar* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp4_ = text;
+#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL);
+#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
+		if (!_tmp5_) {
+#line 978 "string.c"
+			const gchar* _tmp6_ = NULL;
+			gchar* _tmp7_ = NULL;
+			const gchar* _tmp8_ = NULL;
+#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
+			_tmp6_ = text;
+#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
+			_tmp7_ = guess_convert (_tmp6_);
+#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
+			_g_free0 (prepped);
+#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
+			prepped = _tmp7_;
+#line 139 "/home/jens/Source/shotwell/src/util/string.vala"
+			_tmp8_ = prepped;
+#line 139 "/home/jens/Source/shotwell/src/util/string.vala"
+			if (_tmp8_ == NULL) {
+#line 994 "string.c"
+				const gchar* _tmp9_ = NULL;
+				PrepareInputTextOptions _tmp10_ = 0;
+				gchar* _tmp11_ = NULL;
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp10_ = options;
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				if ((_tmp10_ & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) {
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+					_tmp9_ = NULL;
+#line 1004 "string.c"
+				} else {
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+					_tmp9_ = "";
+#line 1008 "string.c"
+				}
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				_tmp11_ = g_strdup (_tmp9_);
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				result = _tmp11_;
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				_g_free0 (prepped);
+#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+				return result;
+#line 1018 "string.c"
+			}
 		}
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp7_ = g_strdup (_tmp5_);
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-		result = _tmp7_;
-#line 99 "/home/jens/Source/shotwell/src/util/string.vala"
-		return result;
-#line 734 "string.c"
 	}
-#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp8_ = text;
-#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp9_ = g_strdup (_tmp8_);
-#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
-	prepped = _tmp9_;
-#line 107 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp10_ = options;
-#line 107 "/home/jens/Source/shotwell/src/util/string.vala"
-	if ((_tmp10_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) {
-#line 746 "string.c"
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp11_ = prepped;
-#line 108 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp12_ = g_utf8_normalize (_tmp11_, (gssize) -1, G_NORMALIZE_NFC);
-#line 108 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp12_ = options;
+#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+	if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) {
+#line 1026 "string.c"
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp13_ = prepped;
+#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp14_ = g_utf8_normalize (_tmp13_, (gssize) -1, G_NORMALIZE_NFC);
+#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (prepped);
-#line 108 "/home/jens/Source/shotwell/src/util/string.vala"
-		prepped = _tmp12_;
-#line 757 "string.c"
+#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
+		prepped = _tmp14_;
+#line 1037 "string.c"
 	}
-#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp13_ = options;
-#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
-	if ((_tmp13_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) {
-#line 763 "string.c"
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp14_ = prepped;
-#line 111 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp15_ = string_strip (_tmp14_);
-#line 111 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp15_ = options;
+#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
+	if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) {
+#line 1043 "string.c"
+		const gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
+#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp16_ = prepped;
+#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp17_ = string_strip (_tmp16_);
+#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (prepped);
-#line 111 "/home/jens/Source/shotwell/src/util/string.vala"
-		prepped = _tmp15_;
-#line 774 "string.c"
+#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+		prepped = _tmp17_;
+#line 1054 "string.c"
 	}
-#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp16_ = options;
-#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
-	if ((_tmp16_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) {
-#line 780 "string.c"
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp17_ = prepped;
-#line 116 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp18_ = string_delimit (_tmp17_, "\n\r", ' ');
-#line 116 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp18_ = options;
+#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+	if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) {
+#line 1060 "string.c"
+		const gchar* _tmp19_ = NULL;
+		gchar* _tmp20_ = NULL;
+#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp19_ = prepped;
+#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp20_ = string_delimit (_tmp19_, "\n\r", ' ');
+#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (prepped);
-#line 116 "/home/jens/Source/shotwell/src/util/string.vala"
-		prepped = _tmp18_;
-#line 791 "string.c"
+#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
+		prepped = _tmp20_;
+#line 1071 "string.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp20_ = options;
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-	if ((_tmp20_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) {
-#line 797 "string.c"
-		const gchar* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp21_ = prepped;
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp22_ = is_string_empty (_tmp21_);
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp19_ = _tmp22_;
-#line 806 "string.c"
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp22_ = options;
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+	if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) {
+#line 1077 "string.c"
+		const gchar* _tmp23_ = NULL;
+		gboolean _tmp24_ = FALSE;
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp23_ = prepped;
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp24_ = is_string_empty (_tmp23_);
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp21_ = _tmp24_;
+#line 1086 "string.c"
 	} else {
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp19_ = FALSE;
-#line 810 "string.c"
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp21_ = FALSE;
+#line 1090 "string.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/util/string.vala"
-	if (_tmp19_) {
-#line 119 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+	if (_tmp21_) {
+#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
 		result = NULL;
-#line 119 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (prepped);
-#line 119 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
 		return result;
-#line 820 "string.c"
+#line 1100 "string.c"
 	}
-#line 124 "/home/jens/Source/shotwell/src/util/string.vala"
-	_tmp23_ = dest_length;
-#line 124 "/home/jens/Source/shotwell/src/util/string.vala"
-	if (_tmp23_ >= 0) {
-#line 826 "string.c"
+#line 166 "/home/jens/Source/shotwell/src/util/string.vala"
+	_tmp25_ = dest_length;
+#line 166 "/home/jens/Source/shotwell/src/util/string.vala"
+	if (_tmp25_ >= 0) {
+#line 1106 "string.c"
 		GString* sb = NULL;
-		const gchar* _tmp24_ = NULL;
-		GString* _tmp25_ = NULL;
-		GString* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
+		const gchar* _tmp26_ = NULL;
+		GString* _tmp27_ = NULL;
 		GString* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp24_ = prepped;
-#line 125 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp25_ = g_string_new (_tmp24_);
-#line 125 "/home/jens/Source/shotwell/src/util/string.vala"
-		sb = _tmp25_;
-#line 126 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp26_ = sb;
-#line 126 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp27_ = dest_length;
-#line 126 "/home/jens/Source/shotwell/src/util/string.vala"
-		g_string_truncate (_tmp26_, (gsize) _tmp27_);
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+		gint _tmp29_ = 0;
+		GString* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
+		gchar* _tmp32_ = NULL;
+#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp26_ = prepped;
+#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp27_ = g_string_new (_tmp26_);
+#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
+		sb = _tmp27_;
+#line 168 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp28_ = sb;
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp29_ = _tmp28_->str;
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
-		_tmp30_ = g_strdup (_tmp29_);
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
-		result = _tmp30_;
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 168 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp29_ = dest_length;
+#line 168 "/home/jens/Source/shotwell/src/util/string.vala"
+		g_string_truncate (_tmp28_, (gsize) _tmp29_);
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp30_ = sb;
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp31_ = _tmp30_->str;
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
+		_tmp32_ = g_strdup (_tmp31_);
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
+		result = _tmp32_;
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_string_free0 (sb);
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (prepped);
-#line 127 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
 		return result;
-#line 861 "string.c"
+#line 1141 "string.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 173 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = prepped;
-#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 173 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 867 "string.c"
+#line 1147 "string.c"
 }
 
 
@@ -872,19 +1153,19 @@ gint64 parse_int64 (const gchar* str, gint num_base) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint64 _tmp2_ = 0LL;
-#line 134 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = str;
-#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = num_base;
-#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = g_ascii_strtoll (_tmp0_, NULL, (guint) _tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 888 "string.c"
+#line 1168 "string.c"
 }
 
 
@@ -895,35 +1176,35 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 913 "string.c"
+#line 1193 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 921 "string.c"
+#line 1201 "string.c"
 	} else {
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 927 "string.c"
+#line 1207 "string.c"
 	}
 }
 
@@ -933,19 +1214,19 @@ inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
 	const gchar* _tmp0_ = NULL;
 	gunichar _tmp1_ = 0U;
 	gint _tmp2_ = 0;
-#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, FALSE);
-#line 141 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 141 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = needle;
-#line 141 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = string_index_of_char (_tmp0_, _tmp1_, 0);
-#line 141 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp2_ >= 0;
-#line 141 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 949 "string.c"
+#line 1229 "string.c"
 }
 
 
@@ -956,37 +1237,37 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 976 "string.c"
+#line 1256 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 984 "string.c"
+#line 1264 "string.c"
 	} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 990 "string.c"
+#line 1270 "string.c"
 	}
 }
 
@@ -996,21 +1277,21 @@ inline gboolean string_contains_str (const gchar* haystack, const gchar* needle)
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 144 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, FALSE);
-#line 144 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 145 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 145 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = needle;
-#line 145 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = string_index_of (_tmp0_, _tmp1_, 0);
-#line 145 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp2_ >= 0;
-#line 145 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1014 "string.c"
+#line 1294 "string.c"
 }
 
 
@@ -1031,105 +1312,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1047 "string.c"
+#line 1327 "string.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1056 "string.c"
+#line 1336 "string.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1062 "string.c"
+#line 1342 "string.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1071 "string.c"
+#line 1351 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1077 "string.c"
+#line 1357 "string.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1086 "string.c"
+#line 1366 "string.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1090 "string.c"
+#line 1370 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1098 "string.c"
+#line 1378 "string.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1107 "string.c"
+#line 1387 "string.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1111 "string.c"
+#line 1391 "string.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1133 "string.c"
+#line 1413 "string.c"
 }
 
 
@@ -1137,48 +1418,48 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 148 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 190 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = index;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp1_ >= 0) {
-#line 1147 "string.c"
+#line 1427 "string.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gchar* _tmp7_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = str;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp3_ = index;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = str;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp5_ = strlen (_tmp4_);
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = _tmp5_;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = string_slice (_tmp2_, (glong) _tmp3_, (glong) _tmp6_);
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = _tmp7_;
-#line 1170 "string.c"
+#line 1450 "string.c"
 	} else {
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp0_ = NULL;
-#line 1176 "string.c"
+#line 1456 "string.c"
 	}
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1182 "string.c"
+#line 1462 "string.c"
 }
 
 
@@ -1190,27 +1471,27 @@ inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* ne
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
-#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
-#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (needle != NULL, NULL);
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = haystack;
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = needle;
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = start_index;
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = string_index_of (_tmp1_, _tmp2_, _tmp3_);
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = string_sliced_at (_tmp0_, _tmp4_);
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp5_;
-#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1214 "string.c"
+#line 1494 "string.c"
 }
 
 
@@ -1221,37 +1502,37 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1241 "string.c"
+#line 1521 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1249 "string.c"
+#line 1529 "string.c"
 	} else {
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1255 "string.c"
+#line 1535 "string.c"
 	}
 }
 
@@ -1264,27 +1545,27 @@ inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* nee
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
-#line 156 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (needle != NULL, NULL);
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = haystack;
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = needle;
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = start_index;
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = string_last_index_of (_tmp1_, _tmp2_, _tmp3_);
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = string_sliced_at (_tmp0_, _tmp4_);
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp5_;
-#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1288 "string.c"
+#line 1568 "string.c"
 }
 
 
@@ -1296,25 +1577,25 @@ inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, g
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
-#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 202 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = haystack;
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = ch;
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = start_index;
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = string_index_of_char (_tmp1_, _tmp2_, _tmp3_);
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = string_sliced_at (_tmp0_, _tmp4_);
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp5_;
-#line 161 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1318 "string.c"
+#line 1598 "string.c"
 }
 
 
@@ -1325,35 +1606,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1343 "string.c"
+#line 1623 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1351 "string.c"
+#line 1631 "string.c"
 	} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1357 "string.c"
+#line 1637 "string.c"
 	}
 }
 
@@ -1366,25 +1647,25 @@ inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gi
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (haystack != NULL, NULL);
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = haystack;
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = haystack;
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = ch;
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = start_index;
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = string_last_index_of_char (_tmp1_, _tmp2_, _tmp3_);
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = string_sliced_at (_tmp0_, _tmp4_);
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp5_;
-#line 165 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1388 "string.c"
+#line 1668 "string.c"
 }
 
 
@@ -1392,17 +1673,17 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
 	glong _tmp0_ = 0L;
 	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1406 "string.c"
+#line 1686 "string.c"
 }
 
 
@@ -1414,30 +1695,30 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 	GString* _tmp16_ = NULL;
 	const gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 170 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 212 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_string_new ("");
-#line 170 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 212 "/home/jens/Source/shotwell/src/util/string.vala"
 	stripped = _tmp0_;
-#line 171 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 213 "/home/jens/Source/shotwell/src/util/string.vala"
 	prev_is_space = TRUE;
-#line 1426 "string.c"
+#line 1706 "string.c"
 	{
 		const gchar* iter = NULL;
 		const gchar* _tmp1_ = NULL;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = str;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 		iter = _tmp1_;
-#line 1434 "string.c"
+#line 1714 "string.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp2_ = TRUE;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 			while (TRUE) {
-#line 1441 "string.c"
+#line 1721 "string.c"
 				const gchar* _tmp5_ = NULL;
 				gunichar _tmp6_ = 0U;
 				gunichar ch = 0U;
@@ -1445,89 +1726,89 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
 				gunichar _tmp8_ = 0U;
 				gboolean _tmp9_ = FALSE;
 				gboolean _tmp10_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp2_) {
-#line 1451 "string.c"
+#line 1731 "string.c"
 					const gchar* _tmp3_ = NULL;
 					const gchar* _tmp4_ = NULL;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp3_ = iter;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp4_ = g_utf8_next_char (_tmp3_);
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 					iter = _tmp4_;
-#line 1460 "string.c"
+#line 1740 "string.c"
 				}
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp2_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp5_ = iter;
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp6_ = string_get_char (_tmp5_, (glong) 0);
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!(_tmp6_ != ((gunichar) 0))) {
-#line 172 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
 					break;
-#line 1472 "string.c"
+#line 1752 "string.c"
 				}
-#line 173 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 215 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp7_ = iter;
-#line 173 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 215 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp8_ = string_get_char (_tmp7_, (glong) 0);
-#line 173 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 215 "/home/jens/Source/shotwell/src/util/string.vala"
 				ch = _tmp8_;
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 				_tmp10_ = prev_is_space;
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (!_tmp10_) {
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp9_ = TRUE;
-#line 1486 "string.c"
+#line 1766 "string.c"
 				} else {
 					gunichar _tmp11_ = 0U;
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp11_ = ch;
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp9_ = _tmp11_ != ((gunichar) '0');
-#line 1493 "string.c"
+#line 1773 "string.c"
 				}
-#line 175 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
 				if (_tmp9_) {
-#line 1497 "string.c"
+#line 1777 "string.c"
 					GString* _tmp12_ = NULL;
 					gunichar _tmp13_ = 0U;
 					gunichar _tmp14_ = 0U;
 					gboolean _tmp15_ = FALSE;
-#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp12_ = stripped;
-#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp13_ = ch;
-#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 219 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp14_ = ch;
-#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 219 "/home/jens/Source/shotwell/src/util/string.vala"
 					_tmp15_ = g_unichar_isspace (_tmp14_);
-#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 219 "/home/jens/Source/shotwell/src/util/string.vala"
 					prev_is_space = _tmp15_;
-#line 1514 "string.c"
+#line 1794 "string.c"
 				}
 			}
 		}
 	}
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp16_ = stripped;
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp17_ = _tmp16_->str;
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp18_ = g_strdup (_tmp17_);
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp18_;
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_string_free0 (stripped);
-#line 181 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 223 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1531 "string.c"
+#line 1811 "string.c"
 }
 
 
@@ -1537,56 +1818,56 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
 	gint _tmp0_ = 0;
 	gunichar _tmp1_ = 0U;
 	gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ != ((gunichar) 0)) {
-#line 1553 "string.c"
+#line 1833 "string.c"
 		gint _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			*c = _vala_c;
-#line 1568 "string.c"
+#line 1848 "string.c"
 		}
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1572 "string.c"
+#line 1852 "string.c"
 	} else {
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			*c = _vala_c;
-#line 1580 "string.c"
+#line 1860 "string.c"
 		}
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1584 "string.c"
+#line 1864 "string.c"
 	}
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (c) {
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*c = _vala_c;
-#line 1590 "string.c"
+#line 1870 "string.c"
 	}
 }
 
@@ -1600,17 +1881,17 @@ gchar* string_remove_diacritics (const gchar* istring) {
 	GString* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (istring != NULL, NULL);
-#line 185 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 227 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_string_new ("");
-#line 185 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 227 "/home/jens/Source/shotwell/src/util/string.vala"
 	builder = _tmp0_;
-#line 187 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 229 "/home/jens/Source/shotwell/src/util/string.vala"
 	i = 0;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
-#line 1614 "string.c"
+#line 1894 "string.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1621,76 +1902,76 @@ gchar* string_remove_diacritics (const gchar* istring) {
 		GUnicodeType _tmp8_ = 0;
 		GString* _tmp9_ = NULL;
 		gunichar _tmp10_ = 0U;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp1_ = istring;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = g_utf8_normalize (_tmp1_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp3_ = _tmp2_;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp5_ = string_get_next_char (_tmp3_, &i, &_tmp4_);
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		ch = _tmp4_;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = !_tmp5_;
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		_g_free0 (_tmp3_);
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 		if (_tmp6_) {
-#line 188 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
 			break;
-#line 1643 "string.c"
+#line 1923 "string.c"
 		}
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = ch;
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp8_ = g_unichar_type (_tmp7_);
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 		switch (_tmp8_) {
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_CONTROL:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_FORMAT:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_UNASSIGNED:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_NON_SPACING_MARK:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_COMBINING_MARK:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			case G_UNICODE_ENCLOSING_MARK:
-#line 1663 "string.c"
+#line 1943 "string.c"
 			{
-#line 197 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 239 "/home/jens/Source/shotwell/src/util/string.vala"
 				continue;
-#line 1667 "string.c"
+#line 1947 "string.c"
 			}
 			default:
-#line 189 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
 			break;
-#line 1672 "string.c"
+#line 1952 "string.c"
 		}
-#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 241 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp9_ = builder;
-#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 241 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp10_ = ch;
-#line 199 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 241 "/home/jens/Source/shotwell/src/util/string.vala"
 		g_string_append_unichar (_tmp9_, _tmp10_);
-#line 1680 "string.c"
+#line 1960 "string.c"
 	}
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp11_ = builder;
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp12_ = _tmp11_->str;
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp13_;
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_string_free0 (builder);
-#line 201 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1694 "string.c"
+#line 1974 "string.c"
 }
 
 
@@ -1703,67 +1984,67 @@ gchar* string_to_hex_string (const gchar* str) {
 	GString* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 205 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 247 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_string_new ("");
-#line 205 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 247 "/home/jens/Source/shotwell/src/util/string.vala"
 	builder = _tmp0_;
-#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 249 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = str;
-#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 249 "/home/jens/Source/shotwell/src/util/string.vala"
 	data = (guint8*) _tmp1_;
-#line 208 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 	while (TRUE) {
-#line 1719 "string.c"
+#line 1999 "string.c"
 		guint8* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		guint8* _tmp4_ = NULL;
 		GString* _tmp5_ = NULL;
 		guint8* _tmp6_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp2_ = data;
-#line 208 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 		if (!(((gint) (*_tmp2_)) != 0)) {
-#line 208 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
 			break;
-#line 1731 "string.c"
+#line 2011 "string.c"
 		}
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = data;
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		if (((gint) (*_tmp4_)) != 0) {
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp3_ = " ";
-#line 1739 "string.c"
+#line 2019 "string.c"
 		} else {
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 			_tmp3_ = "";
-#line 1743 "string.c"
+#line 2023 "string.c"
 		}
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp5_ = builder;
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = data;
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		data = _tmp6_ + 1;
-#line 209 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 251 "/home/jens/Source/shotwell/src/util/string.vala"
 		g_string_append_printf (_tmp5_, "%02Xh%s", (guint) (*_tmp6_), _tmp3_);
-#line 1753 "string.c"
+#line 2033 "string.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp7_ = builder;
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp8_ = _tmp7_->str;
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp9_;
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_string_free0 (builder);
-#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1767 "string.c"
+#line 2047 "string.c"
 }
 
 
@@ -1777,31 +2058,31 @@ guint string_collated_hash (void* ptr) {
 	gchar* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = ptr;
-#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = g_strdup ((const gchar*) _tmp0_);
-#line 231 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
 	str = _tmp1_;
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = g_str_hash;
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = g_utf8_collate_key (str, (gssize) -1);
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = _tmp3_;
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = _tmp2_ (_tmp4_);
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp6_ = _tmp5_;
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_free0 (_tmp4_);
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp6_;
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_free0 (str);
-#line 233 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1805 "string.c"
+#line 2085 "string.c"
 }
 
 
@@ -1810,17 +2091,17 @@ guint string_precollated_hash (void* ptr) {
 	GHashFunc _tmp0_ = NULL;
 	void* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 238 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_str_hash;
-#line 238 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = ptr;
-#line 238 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = _tmp0_ ((const gchar*) _tmp1_);
-#line 238 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp2_;
-#line 238 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1824 "string.c"
+#line 2104 "string.c"
 }
 
 
@@ -1838,63 +2119,63 @@ gint string_collated_compare (void* a, void* b) {
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
-#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = g_strdup ((const gchar*) _tmp0_);
-#line 243 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
 	astr = _tmp1_;
-#line 244 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = b;
-#line 244 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = g_strdup ((const gchar*) _tmp2_);
-#line 244 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/string.vala"
 	bstr = _tmp3_;
-#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = astr;
-#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = bstr;
-#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp6_ = g_utf8_collate (_tmp4_, _tmp5_);
-#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/string.vala"
 	_result_ = _tmp6_;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp8_ = _result_;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp8_ != 0) {
-#line 1866 "string.c"
+#line 2146 "string.c"
 		gint _tmp9_ = 0;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp9_ = _result_;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = _tmp9_;
-#line 1872 "string.c"
+#line 2152 "string.c"
 	} else {
 		GCompareFunc _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp10_ = g_strcmp0;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp11_ = astr;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp12_ = bstr;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp13_ = _tmp10_ (_tmp11_, _tmp12_);
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = _tmp13_;
-#line 1888 "string.c"
+#line 2168 "string.c"
 	}
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp7_;
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_free0 (bstr);
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	_g_free0 (astr);
-#line 248 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1898 "string.c"
+#line 2178 "string.c"
 }
 
 
@@ -1907,57 +2188,57 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-#line 252 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (astr != NULL, 0);
-#line 252 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (akey != NULL, 0);
-#line 252 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (bstr != NULL, 0);
-#line 252 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (bkey != NULL, 0);
-#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = g_strcmp0;
-#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = akey;
-#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = bkey;
-#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = _tmp0_ (_tmp1_, _tmp2_);
-#line 253 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/string.vala"
 	_result_ = _tmp3_;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp5_ = _result_;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 	if (_tmp5_ != 0) {
-#line 1933 "string.c"
+#line 2213 "string.c"
 		gint _tmp6_ = 0;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp6_ = _result_;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = _tmp6_;
-#line 1939 "string.c"
+#line 2219 "string.c"
 	} else {
 		GCompareFunc _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp7_ = g_strcmp0;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp8_ = astr;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp9_ = bstr;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp10_ = _tmp7_ (_tmp8_, _tmp9_);
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 		_tmp4_ = _tmp10_;
-#line 1955 "string.c"
+#line 2235 "string.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp4_;
-#line 255 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1961 "string.c"
+#line 2241 "string.c"
 }
 
 
@@ -1966,17 +2247,17 @@ gboolean string_collated_equals (void* a, void* b) {
 	void* _tmp0_ = NULL;
 	void* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 260 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = a;
-#line 260 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = b;
-#line 260 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = string_collated_compare (_tmp0_, _tmp1_);
-#line 260 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp2_ == 0;
-#line 260 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 1980 "string.c"
+#line 2260 "string.c"
 }
 
 
@@ -1987,29 +2268,29 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
-#line 264 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (astr != NULL, FALSE);
-#line 264 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (akey != NULL, FALSE);
-#line 264 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (bstr != NULL, FALSE);
-#line 264 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
 	g_return_val_if_fail (bkey != NULL, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp0_ = astr;
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp1_ = akey;
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp2_ = bstr;
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp3_ = bkey;
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	_tmp4_ = string_precollated_compare (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	result = _tmp4_ == 0;
-#line 265 "/home/jens/Source/shotwell/src/util/string.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/string.vala"
 	return result;
-#line 2013 "string.c"
+#line 2293 "string.c"
 }
 
 
diff --git a/src/util/string.vala b/src/util/string.vala
index 7331780..bf7e605 100644
--- a/src/util/string.vala
+++ b/src/util/string.vala
@@ -91,15 +91,57 @@ public enum PrepareInputTextOptions {
     DEFAULT = EMPTY_IS_NULL | VALIDATE | INVALID_IS_NULL | STRIP_CRLF | STRIP | NORMALIZE;
 }
 
+private string? guess_convert(string text) {
+    string? output = null;
+    size_t bytes_read = 0;
+    unowned string charset = null;
+    debug ("CONVERT: Text did not validate as UTF-8, trying conversion");
+
+    // Try with locale
+    if (!GLib.get_charset(out charset)) {
+        output = text.locale_to_utf8(text.length, out bytes_read, null, null);
+        if (bytes_read == text.length) {
+            debug ("CONVERT: Locale is not UTF-8, convert from %s", charset);
+            return output;
+        }
+    }
+
+    try {
+        output = GLib.convert (text, text.length, "UTF-8", "WINDOWS-1252", out bytes_read);
+        charset = "WINDOWS-1252";
+    } catch (ConvertError error) {
+        if (error is ConvertError.NO_CONVERSION) {
+            try {
+                output = GLib.convert (text, text.length, "UTF-8", "ISO-8859-1", out bytes_read);
+                charset = "ISO-8859-1";
+            } catch (Error error) { /* do nothing */ }
+        }
+    }
+
+    if (bytes_read == text.length) {
+        debug ("CONVERT: Guessed conversion from %s", charset);
+
+        return output;
+    }
+
+    return null;
+}
+
 public string? prepare_input_text(string? text, PrepareInputTextOptions options, int dest_length) {
     if (text == null)
         return null;
     
-    if ((options & PrepareInputTextOptions.VALIDATE) != 0 && !text.validate())
-        return (options & PrepareInputTextOptions.INVALID_IS_NULL) != 0 ? null : "";
-    
-    string prepped = text;
-    
+    string? prepped = text;
+    if (PrepareInputTextOptions.VALIDATE in options) {
+        if (!text.validate()) {
+            prepped = guess_convert (text);
+
+            if (prepped == null) {
+                return (options & PrepareInputTextOptions.INVALID_IS_NULL) != 0 ? null : "";
+            }
+        }
+    }
+
     // Using composed form rather than GLib's default (decomposed) as NFC is the preferred form in
     // Linux and WWW.  More importantly, Pango seems to have serious problems displaying decomposed
     // forms of Korean language glyphs (and perhaps others).  See:
diff --git a/src/util/system.c b/src/util/system.c
index cef9603..d56348e 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.32.1, the Vala compiler
+/* system.c generated by valac 0.34.4, the Vala compiler
  * generated from system.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/ui.c b/src/util/ui.c
index ee1017e..2cb3739 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.32.1, the Vala compiler
+/* ui.c generated by valac 0.34.4, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/thumbnailer/shotwell-video-thumbnailer.c b/thumbnailer/shotwell-video-thumbnailer.c
index cb0a832..6208614 100644
--- a/thumbnailer/shotwell-video-thumbnailer.c
+++ b/thumbnailer/shotwell-video-thumbnailer.c
@@ -1,4 +1,4 @@
-/* shotwell-video-thumbnailer.c generated by valac 0.32.1, the Vala compiler
+/* shotwell-video-thumbnailer.c generated by valac 0.34.4, the Vala compiler
  * generated from shotwell-video-thumbnailer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 7bcf37d..c13a172 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -23,7 +23,6 @@ dist_ui_DATA = \
 	trash.ui
 
 dist_noinst_DATA = \
-	appmenu.ui \
 	set_background_dialog.ui \
 	set_background_slideshow_dialog.ui
 
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 2e3b7c5..dc60376 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -363,7 +363,6 @@ dist_ui_DATA = \
 	trash.ui
 
 dist_noinst_DATA = \
-	appmenu.ui \
 	set_background_dialog.ui \
 	set_background_slideshow_dialog.ui
 
diff --git a/ui/appmenu.ui b/ui/appmenu.ui
deleted file mode 100644
index 72e5424..0000000
--- a/ui/appmenu.ui
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
-<interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Preferences</attribute>
-        <attribute name="action">win.CommonPreferences</attribute>
-      </item>
-    </section>
-    <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>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.CommonAbout</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>
-  </menu>
-  <menu id="direct-appmenu">
-    <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>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.CommonAbout</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>
-  </menu>
-</interface>
diff --git a/ui/direct.ui b/ui/direct.ui
index 6053967..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -32,6 +32,13 @@
           <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>
@@ -162,5 +169,29 @@
         </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/event.ui b/ui/event.ui
index c2bc6cb..11d9b74 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -88,6 +88,12 @@
           <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>
@@ -408,6 +414,30 @@
       </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>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index ad4135e..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -20,6 +20,13 @@
           <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>
@@ -53,6 +60,12 @@
           <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>
@@ -133,6 +146,30 @@
         </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>
diff --git a/ui/import.ui b/ui/import.ui
index af733bc..73320d6 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -28,6 +28,13 @@
           <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>
@@ -56,6 +63,12 @@
           <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>
@@ -99,49 +112,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -166,6 +179,30 @@
         </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>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index a19c32b..9b07d9c 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -26,6 +26,13 @@
           <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>
@@ -71,6 +78,12 @@
           <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 895855a..e3d8ba1 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -35,6 +35,13 @@
           <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>
@@ -81,6 +88,12 @@
           <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>
@@ -384,5 +397,29 @@
       </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 273ac73..d6608d6 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -20,6 +20,13 @@
           <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>
@@ -60,6 +67,12 @@
           <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>
@@ -96,49 +109,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -163,6 +176,30 @@
         </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>
diff --git a/ui/photo.ui b/ui/photo.ui
index cb39801..6b662a5 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -43,6 +43,13 @@
           <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>
@@ -77,6 +84,12 @@
           <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>
@@ -367,5 +380,29 @@
         </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/sidebar_default_context.ui b/ui/sidebar_default_context.ui
index 644d8c7..bd3d63a 100644
--- a/ui/sidebar_default_context.ui
+++ b/ui/sidebar_default_context.ui
@@ -4,12 +4,12 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
-        <attribute name="action">win.CommonNewSearch</attribute>
+        <attribute name="action">sidebar.search.new</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>
+        <attribute name="action">sidebar.tag.new</attribute>
       </item>
     </section>
   </menu>
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui
index 96b0f1e..b810c28 100644
--- a/ui/tag_sidebar_context.ui
+++ b/ui/tag_sidebar_context.ui
@@ -4,7 +4,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">New _Tag…</attribute>
-        <attribute name="action">win.CommonNewTag</attribute>
+        <attribute name="action">sidebar.tag.new</attribute>
       </item>
     </section>
   </menu>
diff --git a/ui/tags.ui b/ui/tags.ui
index e2cb3cf..334b24d 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -35,6 +35,13 @@
           <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>
@@ -81,6 +88,12 @@
           <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>
@@ -345,7 +358,7 @@
             <item>
               <attribute name="label" translatable="yes">Camera</attribute>
               <attribute name="action">win.RawDeveloper</attribute>
-              <attribute name="action">Camera</attribute>
+              <attribute name="target">Camera</attribute>
             </item>
           </section>
         </submenu>
@@ -403,8 +416,48 @@
       </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="TagsContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_New</attribute>
+        <attribute name="action">win.NewChildTagSidebar</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Rename…</attribute>
+        <attribute name="action">win.RenameTag</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Delete</attribute>
+        <attribute name="action">win.DeleteTag</attribute>
+      </item>
+    </section>
   </menu>
 </interface>
diff --git a/ui/trash.ui b/ui/trash.ui
index 0bd7a20..2fbb9a4 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -25,6 +25,13 @@
           <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>
@@ -69,6 +76,12 @@
           <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>
@@ -105,49 +118,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</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">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -172,6 +185,30 @@
         </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>
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-01-21 19:17:10 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-01-21 19:17:10 +0100
commit	a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch)
tree	d9f86def771c7845f241ec81219b243c70523c60
parent	66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)